Skip to content

fix: correct UI text and metadata typos #14847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coolebyak wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −45
Open

fix: correct UI text and metadata typos #14847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/AppSettings/UdpSettings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ColumnLayout {
Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize
wrapMode: Text.WordWrap
text: qsTr("Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.")
text: qsTr("Note: For best performance, please disable AutoConnect to UDP devices on the General page.")
}

RowLayout {
Expand Down
2 changes: 1 addition & 1 deletion src/AppSettings/pages/Video.SettingsUI.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"heading": "Video Source",
"keywords": ["video source", "camera", "stream"],
"enableWhen": "!autoStreamConfig",
"headingDescription": "autoStreamConfig ? qsTr(\"Mavlink camera stream is automatically configured\") : \"\"",
"headingDescription": "autoStreamConfig ? qsTr(\"MAVLink camera stream is automatically configured\") : \"\"",
"controls": [
{
"setting": "videoSettings.videoSource",
Expand Down
2 changes: 1 addition & 1 deletion src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PX4TuningComponent {
tuningPage: "PX4TuningComponentPlaneRate.qml"
}
ListElement {
buttonText: qsTr("Rate Controller")
buttonText: qsTr("Attitude Controller")
tuningPage: "PX4TuningComponentPlaneAttitude.qml"
}
}
Expand Down
22 changes: 11 additions & 11 deletions src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneRate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ ColumnLayout {
]
property var params: ListModel {
ListElement {
title: qsTr("Porportional gain (FW_RR_P)")
description: qsTr("Porportional gain.")
title: qsTr("Proportional gain (FW_RR_P)")
description: qsTr("Proportional gain.")
param: "FW_RR_P"
min: 0.0
max: 1
Expand All @@ -48,7 +48,7 @@ ColumnLayout {
}
ListElement {
title: qsTr("Feedforward Gain (FW_RR_FF)")
description: qsTr("Feedforward gused to compensate for aerodynamic damping.")
description: qsTr("Feedforward used to compensate for aerodynamic damping.")
param: "FW_RR_FF"
min: 0.0
max: 10.0
Expand All @@ -64,8 +64,8 @@ ColumnLayout {
]
property var params: ListModel {
ListElement {
title: qsTr("Porportional Gain (FW_PR_P)")
description: qsTr("Porportional Gain.")
title: qsTr("Proportional Gain (FW_PR_P)")
description: qsTr("Proportional Gain.")
param: "FW_PR_P"
min: 0.0
max: 1
Expand All @@ -89,7 +89,7 @@ ColumnLayout {
}
ListElement {
title: qsTr("Feedforward Gain (FW_PR_FF)")
description: qsTr("Feedforward gused to compensate for aerodynamic damping.")
description: qsTr("Feedforward used to compensate for aerodynamic damping.")
param: "FW_PR_FF"
min: 0.0
max: 10.0
Expand All @@ -105,16 +105,16 @@ ColumnLayout {
]
property var params: ListModel {
ListElement {
title: qsTr("Porportional Gain (FW_YR_P)")
description: qsTr("Porportional Gain.")
title: qsTr("Proportional Gain (FW_YR_P)")
description: qsTr("Proportional Gain.")
param: "FW_YR_P"
min: 0.0
max: 1
step: 0.005
}
ListElement {
title: qsTr("Integral Gain (FW_YR_D)")
description: qsTr("Generally does not need much adjustment, reduce this when seeing slow oscillations.")
title: qsTr("Differential Gain (FW_YR_D)")
description: qsTr("Damping: increase to reduce overshoots and oscillations, but not higher than really needed.")
param: "FW_YR_D"
min: 0.0
max: 1.0
Expand All @@ -130,7 +130,7 @@ ColumnLayout {
}
ListElement {
title: qsTr("Feedforward Gain (FW_YR_FF)")
description: qsTr("Feedforward gused to compensate for aerodynamic damping.")
description: qsTr("Feedforward used to compensate for aerodynamic damping.")
param: "FW_YR_FF"
min: 0.0
max: 10.0
Expand Down
2 changes: 1 addition & 1 deletion src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ColumnLayout {
property var plot: [
{ name: "Airspeed", value: globals.activeVehicle.airSpeed.value },
{ name: "Airspeed Setpoint", value: globals.activeVehicle.airSpeedSetpoint.value },
{ name: "Altitide (Rel)", value: globals.activeVehicle.altitudeTuning.value },
{ name: "Altitude (Rel)", value: globals.activeVehicle.altitudeTuning.value },
{ name: "Altitude Setpoint", value: globals.activeVehicle.altitudeTuningSetpoint.value }
]
property var params: ListModel {
Expand Down
2 changes: 1 addition & 1 deletion src/FlyView/DefaultChecklist.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Item {

PreFlightCheckButton {
name: qsTr("Wind & weather")
manualText: qsTr("OK for your platform? Lauching into the wind?")
manualText: qsTr("OK for your platform? Launching into the wind?")
}

PreFlightCheckButton {
Expand Down
2 changes: 1 addition & 1 deletion src/FlyView/FixedWingChecklist.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Item {

PreFlightCheckButton {
name: qsTr("Wind & weather")
manualText: qsTr("OK for your platform? Lauching into the wind?")
manualText: qsTr("OK for your platform? Launching into the wind?")
}

PreFlightCheckButton {
Expand Down
2 changes: 1 addition & 1 deletion src/FlyView/VTOLChecklist.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Item {

PreFlightCheckButton {
name: "Wind & weather"
manualText: qsTr("OK for your platform? Lauching into the wind?")
manualText: qsTr("OK for your platform? Launching into the wind?")
}

PreFlightCheckButton {
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/CameraCalc.FactMetaData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
{
"name": "ImageDensity",
"shortDesc": "Image desity at surface.",
"shortDesc": "Image density at surface.",
"type": "double",
"min": 0,
"units": "cm/px",
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/CameraSpec.FactMetaData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
{
"name": "FixedOrientation",
"shortDesc": "Camera orientation ix fixed and cannot be changed.",
"shortDesc": "Camera orientation is fixed and cannot be changed.",
"type": "bool",
"default": 0
},
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/CorridorScan.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"name": "Trigger distance",
"shortDesc": "Distance between each triggering of the camera. 0 specifies not camera trigger.",
"shortDesc": "Distance between each triggering of the camera. 0 specifies no camera trigger.",
"type": "double",
"decimalPlaces": 2,
"min": 0,
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/FWLandingPattern.FactMetaData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
},
{
"name": "UseLoiterToAlt",
"shortDesc": "Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.",
"shortDesc": "Use a loiter to altitude item for final approach. Otherwise use a regular waypoint.",
"type": "bool",
"default": true
},
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/MavCmdInfoCommon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
{
"id": 113,
"rawName": "MAV_CMD_CONDITION_CHANGE_ALT",
"description": "Delay the mission until the specified altitide is reached.",
"description": "Delay the mission until the specified altitude is reached.",
"friendlyName": "Wait for altitude",
"category": "Conditionals",
"specifiesCoordinate": false,
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/StructureScan.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
{
"name": "ScanBottomAlt",
"shortDesc": "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.",
"shortDesc": "Altitude for the bottommost covered area of the scan. You can adjust this value such that the Bottom Layer Alt will fly above obstacles on the ground.",
"type": "double",
"units": "vertical m",
"decimalPlaces": 1,
Expand Down
2 changes: 1 addition & 1 deletion src/MissionManager/VTOLLandingPattern.FactMetaData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
},
{
"name": "UseLoiterToAlt",
"shortDesc": "Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.",
"shortDesc": "Use a loiter to altitude item for final approach. Otherwise use a regular waypoint.",
"type": "bool",
"default": true
},
Expand Down
18 changes: 9 additions & 9 deletions src/Settings/App.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
{
"name": "offlineEditingDescentSpeed",
"shortDesc": "Offline editing descent speed",
"longDesc": "This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.",
"longDesc": "This value defines the descent speed for multi-rotor vehicles for use in calculating mission duration.",
"type": "double",
"default": 1.0,
"min": 0.1,
Expand Down Expand Up @@ -121,26 +121,26 @@
},
{
"name": "audioMuted",
"shortDesc": "Mute audio output",
"longDesc": "Mutes all audio output without changing the volume level.",
"shortDesc": "Mute voice notifications",
"longDesc": "Mutes voice notifications without changing the volume level.",
"type": "bool",
"default": false,
"label": "Mute Audio Output",
"keywords": "audio,mute,sound"
"label": "Mute Voice Notifications",
"keywords": "audio,mute,sound,voice,notifications"
},
{
"name": "audioVolume",
"shortDesc": "Controls the volume level for audio alerts and notifications.",
"longDesc": "Sets the audio output volume percentage.",
"shortDesc": "Controls the volume level for voice notifications.",
"longDesc": "Sets the voice notification volume percentage.",
"type": "double",
"default": 100.0,
"units": "%",
"min": 0.0,
"decimalPlaces": 1,
"userMin": 0.0,
"userMax": 100.0,
"label": "Audio Output Volume",
"keywords": "audio,volume,sound"
"label": "Voice Notification Volume",
"keywords": "audio,volume,sound,voice,notifications"
},
{
"name": "virtualJoystick",
Expand Down
2 changes: 1 addition & 1 deletion src/Settings/Mavlink.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"name": "telemetrySaveNotArmed",
"shortDesc": "Also save telemetry logs from sessions where the vehicle was never armed.",
"longDesc": "If this option is enabled a telemtry log will be saved even if vehicle was never armed.",
"longDesc": "If this option is enabled a telemetry log will be saved even if vehicle was never armed.",
"type": "bool",
"default": false,
"label": "Save logs even if vehicle was not armed",
Expand Down
4 changes: 2 additions & 2 deletions src/Settings/RemoteID.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"comment": "enumValues must stay in sync with MAVLink MAV_ODID_UA_TYPE",
"shortDesc": "Classification of the unmanned aircraft (multirotor, fixed-wing, etc.).",
"type": "uint8",
"enumStrings": "Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other",
"enumStrings": "Undefined,Airplane/FixedWing,Helicopter/Multirotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Balloon,Captive Balloon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other",
"enumValues": "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15",
"default": 0,
"label": "UA type",
Expand Down Expand Up @@ -148,7 +148,7 @@
"shortDesc": "Source for operator location data (live GNSS or fixed coordinates).",
"longDesc": "Operator location Type",
"type": "uint8",
"enumStrings": "Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)",
"enumStrings": "Takeoff(Not Supported),Live GNSS, Fixed (not for FAA)",
"enumValues": "0,1,2",
"default": 1,
"label": "Location Type",
Expand Down
6 changes: 3 additions & 3 deletions src/Settings/Video.SettingsGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,16 @@
{
"name": "disableWhenDisarmed",
"shortDesc": "Disables the video stream when the vehicle is disarmed to save bandwidth.",
"longDesc": "Disable Video Stream when disarmed.",
"longDesc": "Disables the video stream when the vehicle is disarmed.",
"type": "bool",
"default": false,
"label": "Stop recording when disarmed",
"label": "Disable Video Stream When Disarmed",
"keywords": "disable when disarmed"
},
{
"name": "lowLatencyMode",
"shortDesc": "Reduce video latency by approximately 200ms using optimized streaming settings.",
"longDesc": "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.",
"longDesc": "If this option is enabled, the rtpjitterbuffer is removed and the video sink is set to asynchronous mode, reducing the latency by about 200 ms.",
"type": "bool",
"default": false,
"label": "Low Latency Mode",
Expand Down
4 changes: 2 additions & 2 deletions src/Vehicle/FactGroups/EFIFact.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@
},
{
"name": "intakePress",
"shortDesc": "Intake mainfold pressure",
"shortDesc": "Intake manifold pressure",
"type": "float",
"decimalPlaces": 1,
"units": "kPa"
},
{
"name": "intakeTemp",
"shortDesc": "Intake mainfold temperature",
"shortDesc": "Intake manifold temperature",
"type": "float",
"decimalPlaces": 1,
"units": "°C"
Expand Down
2 changes: 1 addition & 1 deletion src/Vehicle/FactGroups/EstimatorStatusFactGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[
{
"name": "goodAttitudeEsimate",
"shortDesc": "Good Attitude Esimate",
"shortDesc": "Good Attitude Estimate",
"type": "bool",
"default": false
},
Expand Down
2 changes: 1 addition & 1 deletion src/Vehicle/VehicleSetup/FirmwareImage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ bool FirmwareImage::_binLoad(const QString& imageFilename)
{
QFile binFile(imageFilename);
if (!binFile.open(QIODevice::ReadOnly)) {
emit statusMessage(tr("Unabled to open firmware file %1, %2").arg(imageFilename, binFile.errorString()));
emit statusMessage(tr("Unable to open firmware file %1, %2").arg(imageFilename, binFile.errorString()));
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/VideoManager/VideoManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ void VideoManager::startRecording(const QString &videoFile)

const QString savePath = SettingsManager::instance()->appSettings()->videoSavePath();
if (savePath.isEmpty()) {
QGC::showAppMessage(tr("Unabled to record video. Video save path must be specified in Settings."));
QGC::showAppMessage(tr("Unable to record video. Video save path must be specified in Settings."));
return;
}

Expand Down
Loading