diff --git a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml index 2463ac998479a196a0f03c7d5357f0cefface4e7..0c56476c70d101016f190e6d56ca32a3ab688e8a 100644 --- a/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml @@ -80,7 +80,7 @@ Item { readonly property string mrLoiterModeDescription: qsTr("The multirotor hovers at the current position and altitude. ") readonly property string returnModeName: qsTr("Return") - readonly property string returnModeDescription: qsTr("The vehicle returns to the home position, loiters and then lands. ") + readonly property string returnModeDescription: qsTr("The vehicle returns to the launch position, loiters and then lands. ") readonly property string offboardModeName: qsTr("Offboard") readonly property string offboardModeDescription: qsTr("All flight control aspects are controlled by an offboard system.") diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 40a0630293bc2cd0185867e697990ea1b83cec37..0696b774f0ed33d5044b371e72bfb5e86e7d6a77 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -410,7 +410,7 @@ SetupPage { } QGCLabel { - text: qsTr("Return Home Settings") + text: qsTr("Return To Launch Settings") } Rectangle { @@ -449,7 +449,7 @@ SetupPage { } QGCLabel { - text: qsTr("Return home, then:") + text: qsTr("Return to launch, then:") Layout.columnSpan: 2 } Row { diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml index c7ece2b7e39129be49a2e609fc06b0d07679d787..bb5831b961f4b4d63d36507fae99a827e5fb089b 100644 --- a/src/FlightDisplay/GuidedActionsController.qml +++ b/src/FlightDisplay/GuidedActionsController.qml @@ -60,7 +60,7 @@ Item { readonly property string continueMissionMessage: qsTr("Continue the mission from the current waypoint.") readonly property string resumeMissionUploadFailMessage: qsTr("Upload of resume mission failed. Confirm to retry upload") 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 rtlMessage: qsTr("Return to the launch position of the vehicle.") readonly property string changeAltMessage: qsTr("Change the altitude of the vehicle up or down.") readonly property string gotoMessage: qsTr("Move the vehicle to the specified location.") property string setWaypointMessage: qsTr("Adjust current waypoint to %1.").arg(_actionData) diff --git a/src/FlightMap/Widgets/CenterMapDropButton.qml b/src/FlightMap/Widgets/CenterMapDropButton.qml index df3c449331027d4eca8d2f3eae44a87ffdaa62c2..68a886207bf953f6375041f7a13748c51589dc3d 100644 --- a/src/FlightMap/Widgets/CenterMapDropButton.qml +++ b/src/FlightMap/Widgets/CenterMapDropButton.qml @@ -186,7 +186,7 @@ DropButton { } QGCButton { - text: qsTr("Home") + text: qsTr("Launch") Layout.fillWidth: true enabled: !followVehicleCheckBox.checked diff --git a/src/FlightMap/Widgets/CenterMapDropPanel.qml b/src/FlightMap/Widgets/CenterMapDropPanel.qml index a27c4ec785c96fef8ae88c4c49aa479b061fa843..e319fc7c6c0792cabdab65d253e78fcf3825d0ed 100644 --- a/src/FlightMap/Widgets/CenterMapDropPanel.qml +++ b/src/FlightMap/Widgets/CenterMapDropPanel.qml @@ -51,7 +51,7 @@ ColumnLayout { } QGCButton { - text: qsTr("Home") + text: qsTr("Launch") Layout.fillWidth: true onClicked: { diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json index 48a9cb1085dc47778114b387f06b8caa03e4da05..8ada5854f4e59566837ec249d83d4a72e716d618 100644 --- a/src/MissionManager/MavCmdInfoCommon.json +++ b/src/MissionManager/MavCmdInfoCommon.json @@ -138,8 +138,8 @@ { "id": 20, "rawName": "MAV_CMD_NAV_RETURN_TO_LAUNCH", - "friendlyName": "Return Home", - "description": "Send the vehicle back to the home position.", + "friendlyName": "Return To Launch", + "description": "Send the vehicle back to the launch position.", "friendlyEdit": true, "category": "Basic" }, @@ -501,8 +501,8 @@ { "id": 179, "rawName": "MAV_CMD_DO_SET_HOME", - "friendlyName": "Set home location", - "description": "Changes the home location either to the current location or a specified location.", + "friendlyName": "Set launch location", + "description": "Changes the launch location either to the current location or a specified location.", "specifiesCoordinate": true, "standaloneCoordinate": true, "friendlyEdit": true, @@ -983,7 +983,7 @@ { "id": 252, "rawName": "MAV_CMD_OVERRIDE_GOTO", "friendlyName": "Override goto" }, { "id": 300, "rawName": "MAV_CMD_MISSION_START", "friendlyName": "Mission start" }, { "id": 400, "rawName": "MAV_CMD_COMPONENT_ARM_DISARM", "friendlyName": "Arm/Disarm" }, - { "id": 410, "rawName": "MAV_CMD_GET_HOME_POSITION", "friendlyName": "Get home position" }, + { "id": 410, "rawName": "MAV_CMD_GET_HOME_POSITION", "friendlyName": "Get launch position" }, { "id": 500, "rawName": "MAV_CMD_START_RX_PAIR", "friendlyName": "Bind Spektrum receiver" }, { "id": 510, "rawName": "MAV_CMD_GET_MESSAGE_INTERVAL", "friendlyName": "Get message interval" }, { "id": 511, "rawName": "MAV_CMD_SET_MESSAGE_INTERVAL", "friendlyName": "Set message interval" }, diff --git a/src/MissionManager/MissionSettings.FactMetaData.json b/src/MissionManager/MissionSettings.FactMetaData.json index b5fe9bd1bf0e260a024b496cb7545514737f4e77..9357d636f8b2747f060db616808644433a7658d6 100644 --- a/src/MissionManager/MissionSettings.FactMetaData.json +++ b/src/MissionManager/MissionSettings.FactMetaData.json @@ -1,7 +1,7 @@ [ { "name": "PlannedHomePositionAltitude", - "shortDescription": "Planned home position altitude", + "shortDescription": "Launch position altitude", "type": "double", "units": "m", "decimalPlaces": 1, diff --git a/src/MissionManager/MissionSettingsItem.cc b/src/MissionManager/MissionSettingsItem.cc index 9d13a50efed5732ae4616fe952262efbdb36fcf6..fae76c439734c6b1695d4c3ea046315dfc99174b 100644 --- a/src/MissionManager/MissionSettingsItem.cc +++ b/src/MissionManager/MissionSettingsItem.cc @@ -282,7 +282,7 @@ void MissionSettingsItem::_setHomeAltFromTerrain(double terrainAltitude) QString MissionSettingsItem::abbreviation(void) const { - return _flyView ? tr("H") : tr("Launch"); + return _flyView ? tr("L") : tr("Launch"); } void MissionSettingsItem::_updateHomePosition(const QGeoCoordinate& homePosition) diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index f8253dc5f48d88bc2dc4a9c97139aa6288972228..c3525f47a3087d59cf94cca882d98dc249878712 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -387,7 +387,7 @@ QString SimpleMissionItem::commandName(void) const QString SimpleMissionItem::abbreviation() const { if (homePosition()) - return tr("H"); + return tr("L"); switch(command()) { case MAV_CMD_NAV_TAKEOFF: diff --git a/src/PlanView/FWLandingPatternEditor.qml b/src/PlanView/FWLandingPatternEditor.qml index c5434397fe52880ae222a4d1b35f4fbe1f97544c..47c7fc5d44f3fb547ba5a92d72b9eb0d60d85cac 100644 --- a/src/PlanView/FWLandingPatternEditor.qml +++ b/src/PlanView/FWLandingPatternEditor.qml @@ -178,7 +178,7 @@ Rectangle { QGCCheckBox { anchors.right: parent.right - text: qsTr("Altitudes relative to home") + text: qsTr("Altitudes relative to launch") checked: missionItem.altitudesAreRelative visible: QGroundControl.corePlugin.options.showMissionAbsoluteAltitude || !missionItem.altitudesAreRelative onClicked: missionItem.altitudesAreRelative = checked diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml index 338cd3004885176e84c1a2f9576f63e4c6037a08..070cb59dfdba474c39df9332994f6bd61e264c6b 100644 --- a/src/PlanView/MissionSettingsEditor.qml +++ b/src/PlanView/MissionSettingsEditor.qml @@ -177,7 +177,7 @@ Rectangle { id: plannedHomePositionSection anchors.left: parent.left anchors.right: parent.right - text: qsTr("Planned Home Position") + text: qsTr("Launch Position") visible: !_vehicleHasHomePosition checked: false } @@ -213,7 +213,7 @@ Rectangle { } QGCButton { - text: qsTr("Set Home To Map Center") + text: qsTr("Set To Map Center") onClicked: missionItem.coordinate = map.center anchors.horizontalCenter: parent.horizontalCenter } diff --git a/src/PlanView/SimpleItemEditor.qml b/src/PlanView/SimpleItemEditor.qml index 2acb7ddff2bc4bd3b5aad54c4087f8df3828bf21..e894cc71ac643185f80ed72429622e8094a9bd37 100644 --- a/src/PlanView/SimpleItemEditor.qml +++ b/src/PlanView/SimpleItemEditor.qml @@ -21,7 +21,7 @@ Rectangle { property real _margin: ScreenTools.defaultFontPixelHeight / 2 property bool _supportsTerrainFrame: missionItem - property string _altModeRelativeHelpText: qsTr("Altitude relative to home altitude") + property string _altModeRelativeHelpText: qsTr("Altitude relative to launch altitude") property string _altModeAbsoluteHelpText: qsTr("Altitude above mean sea level") property string _altModeAboveTerrainHelpText: qsTr("Altitude above terrain\nActual AMSL altitude: %1 %2").arg(missionItem.amslAltAboveTerrain.valueString).arg(missionItem.amslAltAboveTerrain.units) property string _altModeTerrainFrameHelpText: qsTr("Using terrain reference frame") @@ -188,7 +188,7 @@ Rectangle { id: altHamburgerMenu QGCMenuItem { - text: qsTr("Altitude Relative To Home") + text: qsTr("Altitude Relative To Launch") checkable: true checked: missionItem.altitudeMode === QGroundControl.AltitudeModeRelative onTriggered: missionItem.altitudeMode = QGroundControl.AltitudeModeRelative