diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
index 791c7031200f28eb48fe13dd59c5952b10a6b6c8..28c4af97e1b721aebb9ee4abca6df579be26422b 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
@@ -31,7 +31,7 @@ FactPanel {
 
         VehicleSummaryRow {
             labelText: qsTr("Compass 0:")
-            valueText: mag0IdFact ? (mag0IdFact.value === 0 ? qsTr("Setup required") : ("Ready")) : ""
+            valueText: mag0IdFact ? (mag0IdFact.value === 0 ? qsTr("Setup required") : qsTr("Ready")) : ""
         }
 
         VehicleSummaryRow {
diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index 56b32623b8caa7beef14c1fe22f71678d5eb7bba..81b182ab1c17bf5bfea6dd1ceac48732939d85b5 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -75,7 +75,7 @@ Item {
             z:                          QGroundControl.zOrderTopMost
             color:                      mapPal.text
             font.pixelSize:             ScreenTools.largeFontPixelSize
-            text:                       "No GPS Lock for Vehicle"
+            text:                       qsTr("No GPS Lock for Vehicle")
         }
 
         QGCLabel {
@@ -421,7 +421,7 @@ Item {
                 guidedModeConfirm.confirmText = qsTr("land")
                 break;
             case confirmHome:
-                guidedModeConfirm.confirmText = "return to launch"
+                guidedModeConfirm.confirmText = qsTr("return to launch")
                 break;
             case confirmChangeAlt:
                 altitudeSlider.visible = true
diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml
index d10a23b1487c9073500ab078de002e9812b4d920..5a7635c1e6dc94c8db4bdeeb4b0514419affaa7d 100644
--- a/src/FlightMap/Widgets/QGCCompassWidget.qml
+++ b/src/FlightMap/Widgets/QGCCompassWidget.qml
@@ -89,7 +89,7 @@ Item {
             color:              Qt.rgba(0,0,0,0.65)
 
             QGCLabel {
-                text:           active ? heading.toFixed(0) : "OFF"
+                text:           active ? heading.toFixed(0) : qsTr("OFF")
                 font.weight:    active ? Font.DemiBold : Font.Light
                 font.pixelSize: _fontSize < 1 ? 1 : _fontSize;
                 color:          "white"
diff --git a/src/FlightMap/Widgets/ValuesWidget.qml b/src/FlightMap/Widgets/ValuesWidget.qml
index 0e275e52a2d8559c6775465d6f9df23ef8ab8b92..d8e8836b675ce5761779703d42aafc9d338a6868 100644
--- a/src/FlightMap/Widgets/ValuesWidget.qml
+++ b/src/FlightMap/Widgets/ValuesWidget.qml
@@ -52,7 +52,7 @@ QGCFlickable {
     }
 
     function showPicker() {
-        qgcView.showDialog(propertyPicker, "Value Widget Setup", qgcView.showDialogDefaultWidth, StandardButton.Ok)
+        qgcView.showDialog(propertyPicker, qsTr("Value Widget Setup"), qgcView.showDialogDefaultWidth, StandardButton.Ok)
     }
 
     function listContains(list, value) {
@@ -163,7 +163,7 @@ QGCFlickable {
 
                 QGCLabel {
                     id:     _label
-                    text:   "Select the values you want to display:"
+                    text:   qsTr("Select the values you want to display:")
                 }
 
                 Loader {
@@ -195,7 +195,7 @@ QGCFlickable {
             QGCLabel {
                 width:      parent.width
                 wrapMode:   Text.WordWrap
-                text:       factGroup ? factGroupName : "Vehicle must be connected to assign values."
+                text:       factGroup ? factGroupName : qsTr("Vehicle must be connected to assign values.")
             }
 
             Repeater {
@@ -254,7 +254,7 @@ QGCFlickable {
 
                     QGCCheckBox {
                         id:         _largeCheckBox
-                        text:       "large"
+                        text:       qsTr("large")
                         checked:    listContains(controller.largeValues, propertyName)
                         enabled:    _addCheckBox.checked
                         onClicked:  updateValues()
diff --git a/src/MissionEditor/MissionItemStatus.qml b/src/MissionEditor/MissionItemStatus.qml
index 1851f1d7301af47beb91e7c5a288d2aa60a7d355..0819aa004714a58f9caba7173ec6437dd4732e13 100644
--- a/src/MissionEditor/MissionItemStatus.qml
+++ b/src/MissionEditor/MissionItemStatus.qml
@@ -82,6 +82,7 @@ Rectangle {
 
         QGCLabel { text: qsTr("Azimuth:") }
         QGCLabel { text: _azimuthText }
+    }
 
     QGCFlickable {
         anchors.leftMargin:     _margins
diff --git a/src/MissionEditor/SimpleItemEditor.qml b/src/MissionEditor/SimpleItemEditor.qml
index 8141913e209927779a5b281e22d38b46f04b413a..d4a213a6cbd102d1ad603bee891a127cb20a60ac 100644
--- a/src/MissionEditor/SimpleItemEditor.qml
+++ b/src/MissionEditor/SimpleItemEditor.qml
@@ -114,7 +114,7 @@ Rectangle {
             }
 
             QGCButton {
-                text:       "Move Home to map center"
+                text:       qsTr("Move Home to map center")
                 visible:    missionItem.homePosition
                 onClicked:  editorRoot.moveHomeToMapCenter()
                 anchors.horizontalCenter: parent.horizontalCenter
diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml
index 579b5e96bc8e1a0931a6b2bc2c6b6f12134f422e..e0d4a153f13cb9e4dc530caf219bb490cb22ebf3 100644
--- a/src/MissionEditor/SurveyItemEditor.qml
+++ b/src/MissionEditor/SurveyItemEditor.qml
@@ -73,7 +73,7 @@ Rectangle {
 
         QGCCheckBox {
             anchors.left:   parent.left
-            text:           "Relative altitude"
+            text:           qsTr("Relative altitude")
             checked:        missionItem.gridAltitudeRelative
             onClicked:      missionItem.gridAltitudeRelative = checked
         }
@@ -81,7 +81,7 @@ Rectangle {
         QGCCheckBox {
             id:                 cameraTrigger
             anchors.left:       parent.left
-            text:               "Camera trigger:"
+            text:               qsTr("Camera trigger:")
             checked:            missionItem.cameraTrigger
             onClicked:          missionItem.cameraTrigger = checked
         }
@@ -96,7 +96,7 @@ Rectangle {
             QGCLabel {
                 anchors.baseline:   textField.baseline
                 anchors.left:       parent.left
-                text:               "Distance:"
+                text:               qsTr("Distance:")
             }
 
             FactTextField {
@@ -109,7 +109,7 @@ Rectangle {
         }
 
         QGCButton {
-            text: _addPointsMode ? "Finish Polygon" : "Draw Polygon"
+            text: _addPointsMode ? qsTr("Finish Polygon") : qsTr("Draw Polygon")
             onClicked: {
                 if (_addPointsMode) {
                     _addPointsMode = false
diff --git a/src/QmlControls/MissionItemEditor.qml b/src/QmlControls/MissionItemEditor.qml
index 540645fc9e23070c26b6d3ffca489c2927c1437a..80400b00b9560f906d45b932b487c6baeb40cfeb 100644
--- a/src/QmlControls/MissionItemEditor.qml
+++ b/src/QmlControls/MissionItemEditor.qml
@@ -140,7 +140,7 @@ Rectangle {
         anchors.fill:       commandPicker
         visible:            missionItem.sequenceNumber == 0 || !missionItem.isCurrentItem || !missionItem.isSimpleItem
         verticalAlignment:  Text.AlignVCenter
-        text:               missionItem.sequenceNumber == 0 ? "Home Position" : (missionItem.isSimpleItem ? missionItem.commandName : "Survey")
+        text:               missionItem.sequenceNumber == 0 ? qsTr("Home Position") : (missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey"))
         color:              _outerTextColor
     }
 
diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index 6e8604adc3d9b4a2288c09762450d9b7cbc917a6..0fea97ddb63690f7dfe9f34bcc4b51d4538bb6b4 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -330,7 +330,7 @@ QGCView {
                         acceptedButtons:    Qt.LeftButton
                         onClicked: {
                             _editorDialogFact = factRow.modelFact
-                            showDialog(editorDialogComponent, "Parameter Editor", qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Save)
+                            showDialog(editorDialogComponent, qsTr("Parameter Editor"), qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Save)
                         }
                     }
                 }
@@ -365,7 +365,7 @@ QGCView {
 
             QGCLabel {
                 id:     searchForLabel
-                text:   "Search for:"
+                text:   qsTr("Search for:")
             }
 
             QGCTextField {
@@ -380,7 +380,7 @@ QGCView {
                 anchors.top:        searchFor.bottom
                 width:              parent.width
                 wrapMode:           Text.WordWrap
-                text:               "Hint: Leave 'Search For' blank and click Apply to list all parameters sorted by name."
+                text:               qsTr("Hint: Leave 'Search For' blank and click Apply to list all parameters sorted by name.")
             }
         }
     }
diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index e357c5ef9d862adb5dc7067f38ee5562eb04b06b..12a00ff3cfca792e15f64ad0c63d1b6d81c820b1 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -85,7 +85,7 @@ QGCViewDialog {
             QGCLabel {
                 width:      parent.width
                 wrapMode:   Text.WordWrap
-                text:       fact.shortDescription ? fact.shortDescription : "Description missing"
+                text:       fact.shortDescription ? fact.shortDescription : qsTr("Description missing")
             }
 
             QGCLabel {