Merge pull request #5086 from DonLakeFlyer/MoreFixes

More fixes

src/FlightDisplay/GuidedActionsController.qml

@@ -50,10 +50,10 @@ Item {
     readonly property string disarmMessage:             qsTr("Disarm the vehicle")
     readonly property string emergencyStopMessage:      qsTr("WARNING: This still stop all motors. If vehicle is currently in air it will crash.")
     readonly property string takeoffMessage:            qsTr("Takeoff from ground and hold position.")
-    readonly property string startMissionMessage:       qsTr("Start the mission which is currently displayed above. If the vehicle is on the ground it will takeoff.")
+    readonly property string startMissionMessage:       qsTr("Takeoff from ground and start the current mission.")
     readonly property string continueMissionMessage:    qsTr("Continue the mission from the current waypoint.")
-             property string resumeMissionMessage:      qsTr("Resume the mission which is displayed above. This will re-generate the mission from waypoint %1, takeoff and continue the mission.").arg(_resumeMissionIndex)
-    readonly property string resumeMissionReadyMessage: qsTr("Review the modified mission above. Confirm if you want to takeoff and begin mission.")
+             property string resumeMissionMessage:      qsTr("Resume the current mission. This will re-generate the mission from waypoint %1, takeoff and continue the mission.").arg(_resumeMissionIndex)
+    readonly property string resumeMissionReadyMessage: qsTr("Review the modified mission. Confirm if you want to takeoff and begin mission.")
     readonly property string landMessage:               qsTr("Land the vehicle at the current position.")
     readonly property string rtlMessage:                qsTr("Return to the home position of the vehicle.")
     readonly property string changeAltMessage:          qsTr("Change the altitude of the vehicle up or down.")

src/PlanView/SurveyItemEditor.qml

@@ -418,11 +418,10 @@ Rectangle {
                 }
 
                 QGCLabel {
-                    wrapMode:       Text.WordWrap
-                    font.pointSize: ScreenTools.smallFontPointSize
-                    text:           qsTr("Which value would you like to keep constant as you adjust other settings")
+                    wrapMode:               Text.WordWrap
+                    text:                   qsTr("Select one:")
                     Layout.preferredWidth:  parent.width
-                    Layout.columnSpan: 2
+                    Layout.columnSpan:      2
                 }
 
                 QGCRadioButton {

src/QmlControls/QGroundControlQmlGlobal.cc

@@ -26,7 +26,7 @@ const char* QGroundControlQmlGlobal::_flightMapZoomSettingsKey =
 
 QGroundControlQmlGlobal::QGroundControlQmlGlobal(QGCApplication* app, QGCToolbox* toolbox)
     : QGCTool(app, toolbox)
-    , _flightMapInitialZoom(14.7)   // About 500 meter scale
+    , _flightMapInitialZoom(17.0)
     , _linkManager(NULL)
     , _multiVehicleManager(NULL)
     , _mapEngineManager(NULL)