diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index d07e94a12b411a18d58939378766b49679e9b96a..368646562df60610f56ea032213086cb6ff201db 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -113,9 +113,9 @@ QGCView {
 
     MessageDialog {
         id:     px4JoystickSupport
-        text:   "Joystick support requires MAVLink MANUAL_CONTROL support. " +
-                "The firmware you are running does not normally support this. " +
-                "It will only work if you have modified the firmware to add MANUAL_CONTROL support."
+        text:   qsTr("Joystick support requires MAVLink MANUAL_CONTROL support. ") +
+                qsTr("The firmware you are running does not normally support this. ") +
+                qsTr("It will only work if you have modified the firmware to add MANUAL_CONTROL support.")
     }
 
     Connections {
diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 0856b97d649ed5fb39eed1bb6d5bc3211f9ee035..70452387bcaf4ba9f548c766dd2f6d526b319cde 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -119,7 +119,7 @@ FlightMap {
 
         sourceItem: MissionItemIndexLabel {
             isCurrentItem:  true
-            label:          "G"
+            label:          qsTr("G", "Goto here waypoint") // second string is translator's hint.
         }
     }
 
diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml
index eb90d3c6d2165ebe9e776050e81422284c0f8364..6ca1221d32fe6f0c8e8a76a51f3b4e025b92516c 100644
--- a/src/FlightDisplay/FlightDisplayViewVideo.qml
+++ b/src/FlightDisplay/FlightDisplayViewVideo.qml
@@ -42,7 +42,7 @@ Item {
         color:          Qt.rgba(0,0,0,0.75)
         visible:        !_controller.videoRunning
         QGCLabel {
-            text:               "NO VIDEO"
+            text:               qsTr("NO VIDEO")
             font.weight:        Font.DemiBold
             color:              "white"
             font.pixelSize:     _mainIsMap ? 12 * ScreenTools.fontHRatio : 20 * ScreenTools.fontHRatio
diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index e02db8f5547facfb58b65b92f4ae39dba463dc22..56b32623b8caa7beef14c1fe22f71678d5eb7bba 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -172,7 +172,7 @@ Item {
 
                     QGCCheckBox {
                         id:                 followVehicleCheckBox
-                        text:               "Follow Vehicle"
+                        text:               qsTr("Follow Vehicle")
                         checked:            _flightMap ? _flightMap._followVehicle : false
                         anchors.baseline:   centerMapButton.baseline
 
@@ -184,7 +184,7 @@ Item {
 
                     QGCButton {
                         id:         centerMapButton
-                        text:       "Center map on Vehicle"
+                        text:       qsTr("Center map on Vehicle")
                         enabled:    _activeVehicle && !followVehicleCheckBox.checked
 
                         property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
@@ -232,7 +232,7 @@ Item {
                     }
 
                     QGCButton {
-                        text:       "Clear flight trails"
+                        text:       qsTr("Clear flight trails")
                         enabled:    QGroundControl.multiVehicleManager.activeVehicle
 
                         onClicked: {
@@ -387,7 +387,7 @@ Item {
                 _activeVehicle.setCurrentMissionSequence(_flightMap._retaskSequence)
                 break;
             default:
-                console.warn("Internal error: unknown confirmActionCode", confirmActionCode)
+                console.warn(qsTr("Internal error: unknown confirmActionCode"), confirmActionCode)
             }
         }
 
@@ -404,21 +404,21 @@ Item {
             confirmActionCode = actionCode
             switch (confirmActionCode) {
             case confirmArm:
-                guidedModeConfirm.confirmText = "arm"
+                guidedModeConfirm.confirmText = qsTr("arm")
                 break;
             case confirmDisarm:
-                guidedModeConfirm.confirmText = "disarm"
+                guidedModeConfirm.confirmText = qsTr("disarm")
                 break;
             case confirmEmergencyStop:
-                guidedModeConfirm.confirmText = "STOP ALL MOTORS!"
+                guidedModeConfirm.confirmText = qsTr("STOP ALL MOTORS!")
                 break;
             case confirmTakeoff:
                 altitudeSlider.visible = true
                 altitudeSlider.setInitialValueMeters(10)
-                guidedModeConfirm.confirmText = "takeoff"
+                guidedModeConfirm.confirmText = qsTr("takeoff")
                 break;
             case confirmLand:
-                guidedModeConfirm.confirmText = "land"
+                guidedModeConfirm.confirmText = qsTr("land")
                 break;
             case confirmHome:
                 guidedModeConfirm.confirmText = "return to launch"
@@ -426,13 +426,13 @@ Item {
             case confirmChangeAlt:
                 altitudeSlider.visible = true
                 altitudeSlider.setInitialValueAppSettingsDistanceUnits(_activeVehicle.altitudeAMSL.value)
-                guidedModeConfirm.confirmText = "change altitude"
+                guidedModeConfirm.confirmText = qsTr("change altitude")
                 break;
             case confirmGoTo:
-                guidedModeConfirm.confirmText = "move vehicle"
+                guidedModeConfirm.confirmText = qsTr("move vehicle")
                 break;
             case confirmRetask:
-                _guidedModeBar.confirmText = "active waypoint change"
+                _guidedModeBar.confirmText = qsTr("active waypoint change")
                 break;
             }
             guidedModeBar.visible = false
@@ -450,24 +450,24 @@ Item {
                 spacing: _margins
 
                 QGCButton {
-                    text:       (_activeVehicle && _activeVehicle.armed) ? (_activeVehicle.flying ? "Emergency Stop" : "Disarm") : "Arm"
+                    text:       (_activeVehicle && _activeVehicle.armed) ? (_activeVehicle.flying ? qsTr("Emergency Stop") : qsTr("Disarm")) :  qsTr("Arm")
                     onClicked:  _guidedModeBar.confirmAction(_activeVehicle.armed ? (_activeVehicle.flying ? _guidedModeBar.confirmEmergencyStop : _guidedModeBar.confirmDisarm) : _guidedModeBar.confirmArm)
                 }
 
                 QGCButton {
-                    text:       "RTL"
+                    text:       qsTr("RTL")
                     visible:    _activeVehicle && _activeVehicle.guidedModeSupported && _activeVehicle.flying
                     onClicked:  _guidedModeBar.confirmAction(_guidedModeBar.confirmHome)
                 }
 
                 QGCButton {
-                    text:       (_activeVehicle && _activeVehicle.flying) ? "Land" : "Takeoff"
+                    text:       (_activeVehicle && _activeVehicle.flying) ?  qsTr("Land"):  qsTr("Takeoff")
                     visible:    _activeVehicle && _activeVehicle.guidedModeSupported && _activeVehicle.armed
                     onClicked:  _guidedModeBar.confirmAction(_activeVehicle.flying ? _guidedModeBar.confirmLand : _guidedModeBar.confirmTakeoff)
                 }
 
                 QGCButton {
-                    text:       "Pause"
+                    text:       qsTr("Pause")
                     visible:    _activeVehicle && _activeVehicle.pauseVehicleSupported && _activeVehicle.flying
                     onClicked:  {
                         guidedModeHideTimer.restart()
@@ -476,7 +476,7 @@ Item {
                 }
 
                 QGCButton {
-                    text:       "Change Altitude"
+                    text:       qsTr("Change Altitude")
                     visible:    _activeVehicle && _activeVehicle.guidedModeSupported && _activeVehicle.armed
                     onClicked:  _guidedModeBar.confirmAction(_guidedModeBar.confirmChangeAlt)
                 }
@@ -557,7 +557,7 @@ Item {
 
             QGCLabel {
                 anchors.horizontalCenter: parent.horizontalCenter
-                text: "Alt (rel)"
+                text: qsTr("Alt (rel)")
             }
 
             QGCLabel {