Commit 011fe913 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #5789 from DonLakeFlyer/StringLoc

Full pass through all .qml files for correct string localization
parents b17d1c68 def534a9
...@@ -29,72 +29,6 @@ SetupPage { ...@@ -29,72 +29,6 @@ SetupPage {
property Fact _oldFrameParam: controller.getParameterFact(-1, "FRAME", false) property Fact _oldFrameParam: controller.getParameterFact(-1, "FRAME", false)
property Fact _newFrameParam: controller.getParameterFact(-1, "FRAME_CLASS", false) property Fact _newFrameParam: controller.getParameterFact(-1, "FRAME_CLASS", false)
property Fact _frameTypeParam: controller.getParameterFact(-1, "FRAME_TYPE", false) property Fact _frameTypeParam: controller.getParameterFact(-1, "FRAME_TYPE", false)
property var _flatParamList: ListModel {
ListElement {
name: "3DR Aero M"
file: "3DR_AERO_M.param"
}
ListElement {
name: "3DR Aero RTF"
file: "3DR_Aero_RTF.param"
}
ListElement {
name: "3DR Rover"
file: "3DR_Rover.param"
}
ListElement {
name: "3DR Tarot"
file: "3DR_Tarot.bgsc"
}
ListElement {
name: "Parrot Bebop"
file: "Parrot_Bebop.param"
}
ListElement {
name: "Storm32"
file: "SToRM32-MAVLink.param"
}
ListElement {
name: "3DR X8-M RTF"
file: "3DR_X8-M_RTF.param"
}
ListElement {
name: "3DR Y6A"
file: "3DR_Y6A_RTF.param"
}
ListElement {
name: "3DR X8+ RTF"
file: "3DR_X8+_RTF.param"
}
ListElement {
name: "3DR QUAD X4 RTF"
file: "3DR_QUAD_X4_RTF.param"
}
ListElement {
name: "3DR X8"
file: "3DR_X8_RTF.param"
}
ListElement {
name: "Iris with GoPro"
file: "Iris with Front Mount Go Pro.param"
}
ListElement {
name: "Iris with Tarot"
file: "Iris with Tarot Gimbal.param"
}
ListElement {
name: "3DR Iris+"
file: "3DR_Iris+.param"
}
ListElement {
name: "Iris"
file: "Iris.param"
}
ListElement {
name: "3DR Y6B"
file: "3DR_Y6B_RTF.param"
}
}
APMAirframeComponentController { APMAirframeComponentController {
...@@ -106,100 +40,6 @@ SetupPage { ...@@ -106,100 +40,6 @@ SetupPage {
id: airframeTypeExclusive id: airframeTypeExclusive
} }
Component {
id: applyRestartDialogComponent
QGCViewDialog {
id: applyRestartDialog
Connections {
target: controller
onCurrentAirframeTypeChanged: {
airframePicker.model = controller.currentAirframeType.airframes;
}
}
QGCLabel {
id: applyParamsText
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: _margins
wrapMode: Text.WordWrap
text: qsTr("Select your drone to load the default parameters for it. ")
}
Flow {
anchors.margins: _margins
anchors.top: applyParamsText.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
spacing : _margins
layoutDirection: Qt.Vertical;
Repeater {
id: airframePicker
model: controller.currentAirframeType.airframes;
delegate: QGCButton {
id: btnParams
width: parent.width / 2.1
height: (ScreenTools.defaultFontPixelHeight * 14) / 5
text: controller.currentAirframeType.airframes[index].name;
onClicked : {
controller.loadParameters(controller.currentAirframeType.airframes[index].params)
hideDialog()
}
}
}
}
}
}
Component {
id: selectParamFileDialogComponent
QGCViewDialog {
QGCLabel {
id: applyParamsText
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: _margins
wrapMode: Text.WordWrap
text: qsTr("Select your drone to load the default parameters for it. ")
}
Flow {
anchors.margins: _margins
anchors.top: applyParamsText.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
spacing : _margins
layoutDirection: Qt.Vertical;
Repeater {
id: airframePicker
model: _flatParamList
delegate: QGCButton {
width: parent.width / 2.1
height: (ScreenTools.defaultFontPixelHeight * 14) / 5
text: name
onClicked : {
controller.loadParameters(file)
hideDialog()
}
}
}
}
}
}
Component { Component {
id: oldFramePageComponent id: oldFramePageComponent
...@@ -219,11 +59,6 @@ SetupPage { ...@@ -219,11 +59,6 @@ SetupPage {
text: qsTr("Please select your airframe type") text: qsTr("Please select your airframe type")
Layout.fillWidth: true Layout.fillWidth: true
} }
QGCButton {
text: qsTr("Load common parameters")
onClicked: showDialog(applyRestartDialogComponent, qsTr("Load common parameters"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
} }
Repeater { Repeater {
...@@ -272,11 +107,6 @@ SetupPage { ...@@ -272,11 +107,6 @@ SetupPage {
indexModel: false indexModel: false
width: ScreenTools.defaultFontPixelWidth * 15 width: ScreenTools.defaultFontPixelWidth * 15
} }
QGCButton {
text: qsTr("Load common parameters")
onClicked: showDialog(selectParamFileDialogComponent, qsTr("Load common parameters"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
} }
} }
} // SetupPage } // SetupPage
...@@ -82,7 +82,7 @@ SetupPage { ...@@ -82,7 +82,7 @@ SetupPage {
} }
ListElement { ListElement {
text: "3DR Iris" text: qsTr("3DR Iris")
voltPin: 2 voltPin: 2
currPin: 3 currPin: 3
voltMult: 12.02 voltMult: 12.02
...@@ -113,7 +113,7 @@ SetupPage { ...@@ -113,7 +113,7 @@ SetupPage {
QGCLabel { QGCLabel {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier." text: qsTr("Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.")
} }
Grid { Grid {
...@@ -122,14 +122,14 @@ SetupPage { ...@@ -122,14 +122,14 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter verticalItemAlignment: Grid.AlignVCenter
QGCLabel { QGCLabel {
text: "Measured voltage:" text: qsTr("Measured voltage:")
} }
QGCTextField { id: measuredVoltage } QGCTextField { id: measuredVoltage }
QGCLabel { text: "Vehicle voltage:" } QGCLabel { text: qsTr("Vehicle voltage:") }
QGCLabel { text: controller.vehicle.battery.voltage.valueString } QGCLabel { text: controller.vehicle.battery.voltage.valueString }
QGCLabel { text: "Voltage multiplier:" } QGCLabel { text: qsTr("Voltage multiplier:") }
FactLabel { fact: battVoltMult } FactLabel { fact: battVoltMult }
} }
...@@ -171,7 +171,7 @@ SetupPage { ...@@ -171,7 +171,7 @@ SetupPage {
QGCLabel { QGCLabel {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value." text: qsTr("Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.")
} }
Grid { Grid {
...@@ -180,14 +180,14 @@ SetupPage { ...@@ -180,14 +180,14 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter verticalItemAlignment: Grid.AlignVCenter
QGCLabel { QGCLabel {
text: "Measured current:" text: qsTr("Measured current:")
} }
QGCTextField { id: measuredCurrent } QGCTextField { id: measuredCurrent }
QGCLabel { text: "Vehicle current:" } QGCLabel { text: qsTr("Vehicle current:") }
QGCLabel { text: controller.vehicle.battery.current.valueString } QGCLabel { text: controller.vehicle.battery.current.valueString }
QGCLabel { text: "Amps per volt:" } QGCLabel { text: qsTr("Amps per volt:") }
FactLabel { fact: battAmpPerVolt } FactLabel { fact: battAmpPerVolt }
} }
......
...@@ -127,7 +127,7 @@ SetupPage { ...@@ -127,7 +127,7 @@ SetupPage {
} }
QGCLabel { QGCLabel {
text: "Detector Pin:" text: qsTr( "Detector Pin:")
width: failsafeSettings._labelWidth width: failsafeSettings._labelWidth
visible: leakEnableCombo.currentIndex != 0 visible: leakEnableCombo.currentIndex != 0
anchors.baseline: leakEnableCombo.baseline anchors.baseline: leakEnableCombo.baseline
...@@ -326,7 +326,7 @@ SetupPage { ...@@ -326,7 +326,7 @@ SetupPage {
} }
QGCLabel { QGCLabel {
text: "Threshold:" text: qsTr("Threshold:")
width: failsafeSettings._labelWidth width: failsafeSettings._labelWidth
visible: pressureEnableCombo.currentIndex != 0 visible: pressureEnableCombo.currentIndex != 0
anchors.baseline: pressureEnableCombo.baseline anchors.baseline: pressureEnableCombo.baseline
......
...@@ -37,16 +37,16 @@ SetupPage { ...@@ -37,16 +37,16 @@ SetupPage {
// Help text which is shown both in the status text area prior to pressing a cal button and in the // Help text which is shown both in the status text area prior to pressing a cal button and in the
// pre-calibration dialog. // pre-calibration dialog.
readonly property string orientationHelpSet: "If the orientation is in the direction of flight, select None." readonly property string orientationHelpSet: qsTr("If the orientation is in the direction of flight, select None.")
readonly property string orientationHelpCal: "Before calibrating make sure orientation settings are correct. " + orientationHelpSet readonly property string orientationHelpCal: qsTr("Before calibrating make sure orientation settings are correct. ") + orientationHelpSet
readonly property string compassRotationText: "If the compass or GPS module is mounted in flight direction, leave the default value (None)" readonly property string compassRotationText: qsTr("If the compass or GPS module is mounted in flight direction, leave the default value (None)")
readonly property string compassHelp: "For Compass calibration you will need to rotate your vehicle through a number of positions." readonly property string compassHelp: qsTr("For Compass calibration you will need to rotate your vehicle through a number of positions.")
readonly property string gyroHelp: "For Gyroscope calibration you will need to place your vehicle on a surface and leave it still." readonly property string gyroHelp: qsTr("For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.")
readonly property string accelHelp: "For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds." readonly property string accelHelp: qsTr("For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.")
readonly property string levelHelp: "To level the horizon you need to place the vehicle in its level flight position and press OK." readonly property string levelHelp: qsTr("To level the horizon you need to place the vehicle in its level flight position and press OK.")
readonly property string statusTextAreaDefaultText: "Start the individual calibration steps by clicking one of the buttons to the left." readonly property string statusTextAreaDefaultText: qsTr("Start the individual calibration steps by clicking one of the buttons to the left.")
// Used to pass help text to the preCalibrationDialog dialog // Used to pass help text to the preCalibrationDialog dialog
property string preCalibrationDialogHelp property string preCalibrationDialogHelp
...@@ -54,8 +54,8 @@ SetupPage { ...@@ -54,8 +54,8 @@ SetupPage {
property string _postCalibrationDialogText property string _postCalibrationDialogText
property var _postCalibrationDialogParams property var _postCalibrationDialogParams
readonly property string _badCompassCalText: "The calibration for Compass %1 appears to be poor. " + readonly property string _badCompassCalText: qsTr("The calibration for Compass %1 appears to be poor. ") +
"Check the compass position within your vehicle and re-do the calibration." qsTr("Check the compass position within your vehicle and re-do the calibration.")
readonly property int sideBarH1PointSize: ScreenTools.mediumFontPointSize readonly property int sideBarH1PointSize: ScreenTools.mediumFontPointSize
readonly property int mainTextH1PointSize: ScreenTools.mediumFontPointSize // Seems to be unused readonly property int mainTextH1PointSize: ScreenTools.mediumFontPointSize // Seems to be unused
...@@ -157,7 +157,7 @@ SetupPage { ...@@ -157,7 +157,7 @@ SetupPage {
var usingUDP = controller.usingUDPLink() var usingUDP = controller.usingUDPLink()
var isSub = QGroundControl.multiVehicleManager.activeVehicle.sub; var isSub = QGroundControl.multiVehicleManager.activeVehicle.sub;
if (usingUDP && !isSub) { if (usingUDP && !isSub) {
showMessage("Sensor Calibration", "Performing sensor calibration over a WiFi connection can be unreliable. If you run into problems try using a direct USB connection instead.", StandardButton.Ok) showMessage(qsTr("Sensor Calibration"), qsTr("Performing sensor calibration over a WiFi connection can be unreliable. If you run into problems try using a direct USB connection instead."), StandardButton.Ok)
} }
} }
...@@ -220,16 +220,16 @@ SetupPage { ...@@ -220,16 +220,16 @@ SetupPage {
spacing: Math.round(ScreenTools.defaultFontPixelHeight / 4) spacing: Math.round(ScreenTools.defaultFontPixelHeight / 4)
QGCLabel { QGCLabel {
text: "Compass " + (index+1) + " " + text: qsTr("Compass ") + (index+1) + " " +
(sensorParams.rgCompassPrimary[index] ? "(primary" : "(secondary") + (sensorParams.rgCompassPrimary[index] ? qsTr("(primary") : qsTr("(secondary")) +
(sensorParams.rgCompassExternalParamAvailable[index] ? (sensorParams.rgCompassExternalParamAvailable[index] ?
(sensorParams.rgCompassExternal[index] ? ", external" : ", internal" ) : (sensorParams.rgCompassExternal[index] ? qsTr(", external") : qsTr(", internal" )) :
"") + "") +
")" ")"
} }
FactCheckBox { FactCheckBox {
text: "Use Compass" text: qsTr("Use Compass")
fact: sensorParams.rgCompassUseFact[index] fact: sensorParams.rgCompassUseFact[index]
visible: sensorParams.rgCompassUseParamAvailable[index] && !sensorParams.rgCompassPrimary[index] visible: sensorParams.rgCompassUseParamAvailable[index] && !sensorParams.rgCompassPrimary[index]
} }
...@@ -274,10 +274,10 @@ SetupPage { ...@@ -274,10 +274,10 @@ SetupPage {
visible: sensorParams.rgCompassAvailable[index] visible: sensorParams.rgCompassAvailable[index]
QGCLabel { QGCLabel {
text: "Compass " + (index+1) + " " + text: qsTr("Compass ") + (index+1) + " " +
(sensorParams.rgCompassPrimary[index] ? "(primary" : "(secondary") + (sensorParams.rgCompassPrimary[index] ? qsTr("(primary") :qsTr( "(secondary")) +
(sensorParams.rgCompassExternalParamAvailable[index] ? (sensorParams.rgCompassExternalParamAvailable[index] ?
(sensorParams.rgCompassExternal[index] ? ", external" : ", internal" ) : (sensorParams.rgCompassExternal[index] ? qsTr(", external") : qsTr(", internal") ) :
"") + "") +
")" ")"
} }
...@@ -288,7 +288,7 @@ SetupPage { ...@@ -288,7 +288,7 @@ SetupPage {
spacing: Math.round(ScreenTools.defaultFontPixelHeight / 4) spacing: Math.round(ScreenTools.defaultFontPixelHeight / 4)
FactCheckBox { FactCheckBox {
text: "Use Compass" text: qsTr("Use Compass")
fact: sensorParams.rgCompassUseFact[index] fact: sensorParams.rgCompassUseFact[index]
visible: sensorParams.rgCompassUseParamAvailable[index] && !sensorParams.rgCompassPrimary[index] visible: sensorParams.rgCompassUseParamAvailable[index] && !sensorParams.rgCompassPrimary[index]
} }
...@@ -389,38 +389,38 @@ SetupPage { ...@@ -389,38 +389,38 @@ SetupPage {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. " + text: qsTr("This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. ") +
"CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. " + qsTr("CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. ") +
"It is technically possible to set-up CompassMot using throttle but this is not recommended." qsTr("It is technically possible to set-up CompassMot using throttle but this is not recommended.")
} }
QGCLabel { QGCLabel {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Disconnect your props, flip them over and rotate them one position around the frame. " + text: qsTr("Disconnect your props, flip them over and rotate them one position around the frame. ") +
"In this configuration they should push the copter down into the ground when the throttle is raised." qsTr("In this configuration they should push the copter down into the ground when the throttle is raised.")
} }
QGCLabel { QGCLabel {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Secure the copter (perhaps with tape) so that it does not move." text: qsTr("Secure the copter (perhaps with tape) so that it does not move.")
} }
QGCLabel { QGCLabel {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Turn on your transmitter and keep throttle at zero." text: qsTr("Turn on your transmitter and keep throttle at zero.")
} }
QGCLabel { QGCLabel {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Click Ok to start CompassMot calibration." text: qsTr("Click Ok to start CompassMot calibration.")
} }
} // Column } // Column
} // QGCFlickable } // QGCFlickable
......
...@@ -144,7 +144,7 @@ Item { ...@@ -144,7 +144,7 @@ Item {
QGCLabel { QGCLabel {
anchors.baseline: returnCombo.baseline anchors.baseline: returnCombo.baseline
text: "Return switch:" text: qsTr("Return switch:")
color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
} }
...@@ -163,7 +163,7 @@ Item { ...@@ -163,7 +163,7 @@ Item {
QGCLabel { QGCLabel {
anchors.baseline: killCombo.baseline anchors.baseline: killCombo.baseline
text: "Kill switch:" text: qsTr("Kill switch:")
color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
} }
...@@ -182,7 +182,7 @@ Item { ...@@ -182,7 +182,7 @@ Item {
QGCLabel { QGCLabel {
anchors.baseline: offboardCombo.baseline anchors.baseline: offboardCombo.baseline
text: "Offboard switch:" text: qsTr("Offboard switch:")
color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
} }
...@@ -202,7 +202,7 @@ Item { ...@@ -202,7 +202,7 @@ Item {
QGCLabel { QGCLabel {
anchors.baseline: vtolCombo.baseline anchors.baseline: vtolCombo.baseline
text: "VTOL mode switch:" text: qsTr("VTOL mode switch:")
color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text) color: parent.fact.value == 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
} }
......
...@@ -26,8 +26,8 @@ SetupPage { ...@@ -26,8 +26,8 @@ SetupPage {
sliderModel: ListModel { sliderModel: ListModel {
ListElement { ListElement {
title: "Roll sensitivity" title: qsTr("Roll sensitivity")
description: "Slide to the left to make roll control faster and more accurate. Slide to the right if roll oscillates or is too twitchy." description: qsTr("Slide to the left to make roll control faster and more accurate. Slide to the right if roll oscillates or is too twitchy.")
param: "FW_R_TC" param: "FW_R_TC"
min: 0.2 min: 0.2
max: 0.8 max: 0.8
...@@ -35,8 +35,8 @@ SetupPage { ...@@ -35,8 +35,8 @@ SetupPage {
} }
ListElement { ListElement {
title: "Pitch sensitivity" title: qsTr("Pitch sensitivity")
description: "Slide to the left to make pitch control faster and more accurate. Slide to the right if pitch oscillates or is too twitchy." description: qsTr("Slide to the left to make pitch control faster and more accurate. Slide to the right if pitch oscillates or is too twitchy.")
param: "FW_P_TC" param: "FW_P_TC"
min: 0.2 min: 0.2
max: 0.8 max: 0.8
...@@ -44,8 +44,8 @@ SetupPage { ...@@ -44,8 +44,8 @@ SetupPage {
} }
ListElement { ListElement {
title: "Cruise throttle" title: qsTr("Cruise throttle")
description: "This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%." description: qsTr("This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%.")
param: "FW_THR_CRUISE" param: "FW_THR_CRUISE"
min: 20 min: 20
max: 80 max: 80
...@@ -53,8 +53,8 @@ SetupPage { ...@@ -53,8 +53,8 @@ SetupPage {
} }
ListElement { ListElement {
title: "Mission mode sensitivity" title: qsTr("Mission mode sensitivity")
description: "Slide to the left to make position control more accurate and more aggressive. Slide to the right to make flight in mission mode smoother and less twitchy." description: qsTr("Slide to the left to make position control more accurate and more aggressive. Slide to the right to make flight in mission mode smoother and less twitchy.")
param: "FW_L1_PERIOD" param: "FW_L1_PERIOD"
min: 12 min: 12
max: 50 max: 50
......
...@@ -118,7 +118,7 @@ SetupPage { ...@@ -118,7 +118,7 @@ SetupPage {
QGCLabel { QGCLabel {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier." text: qsTr("Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.")
} }
Grid { Grid {
...@@ -127,14 +127,14 @@ SetupPage { ...@@ -127,14 +127,14 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter verticalItemAlignment: Grid.AlignVCenter
QGCLabel { QGCLabel {
text: "Measured voltage:" text: qsTr("Measured voltage:")
} }
QGCTextField { id: measuredVoltage } QGCTextField { id: measuredVoltage }
QGCLabel { text: "Vehicle voltage:" } QGCLabel { text: qsTr("Vehicle voltage:") }
QGCLabel { text: controller.vehicle.battery.voltage.valueString } QGCLabel { text: controller.vehicle.battery.voltage.valueString }
QGCLabel { text: "Voltage divider:" } QGCLabel { text: qsTr("Voltage divider:") }
FactLabel { fact: battVoltageDivider } FactLabel { fact: battVoltageDivider }
} }
...@@ -176,7 +176,7 @@ SetupPage { ...@@ -176,7 +176,7 @@ SetupPage {
QGCLabel { QGCLabel {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value." text: qsTr("Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.")
} }
Grid { Grid {
...@@ -185,19 +185,19 @@ SetupPage { ...@@ -185,19 +185,19 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter verticalItemAlignment: Grid.AlignVCenter
QGCLabel { QGCLabel {
text: "Measured current:" text: qsTr("Measured current:")
} }
QGCTextField { id: measuredCurrent } QGCTextField { id: measuredCurrent }
QGCLabel { text: "Vehicle current:" } QGCLabel { text: qsTr("Vehicle current:") }
QGCLabel { text: controller.vehicle.battery.current.valueString } QGCLabel { text: controller.vehicle.battery.current.valueString }
QGCLabel { text: "Amps per volt:" } QGCLabel { text: qsTr("Amps per volt:") }
FactLabel { fact: battAmpsPerVolt } FactLabel { fact: battAmpsPerVolt }
} }
QGCButton { QGCButton {
text: "Calculate" text: qsTr("Calculate")
onClicked: { onClicked: {
var measuredCurrentValue = parseFloat(measuredCurrent.text) var measuredCurrentValue = parseFloat(measuredCurrent.text)
...@@ -301,7 +301,7 @@ SetupPage { ...@@ -301,7 +301,7 @@ SetupPage {
QGCButton { QGCButton {
id: voltMultCalculateButton id: voltMultCalculateButton
text: "Calculate" text: qsTr("Calculate")
onClicked: showDialog(calcVoltageDividerDlgComponent, qsTr("Calculate Voltage Divider"), powerPage.showDialogDefaultWidth, StandardButton.Close) onClicked: showDialog(calcVoltageDividerDlgComponent, qsTr("Calculate Voltage Divider"), powerPage.showDialogDefaultWidth, StandardButton.Close)
} }
...@@ -313,8 +313,8 @@ SetupPage { ...@@ -313,8 +313,8 @@ SetupPage {
Layout.fillWidth: true Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. " + text: qsTr("If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. ") +
"Click the Calculate button for help with calculating a new value." qsTr("Click the Calculate button for help with calculating a new value.")
} }
QGCLabel { QGCLabel {
...@@ -329,7 +329,7 @@ SetupPage { ...@@ -329,7 +329,7 @@ SetupPage {
QGCButton { QGCButton {
id: ampPerVoltCalculateButton id: ampPerVoltCalculateButton
text: "Calculate" text: qsTr("Calculate")
onClicked: showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), powerPage.showDialogDefaultWidth, StandardButton.Close) onClicked: showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), powerPage.showDialogDefaultWidth, StandardButton.Close)
} }
...@@ -341,8 +341,8 @@ SetupPage { ...@@ -341,8 +341,8 @@ SetupPage {
Layout.fillWidth: true Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: "If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. " + text: qsTr("If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. ") +
"Click the Calculate button for help with calculating a new value." qsTr("Click the Calculate button for help with calculating a new value.")
} }
} // Grid } // Grid
} // QGCGroupBox - Battery settings } // QGCGroupBox - Battery settings
......
...@@ -150,7 +150,7 @@ Item { ...@@ -150,7 +150,7 @@ Item {
Component.onCompleted: { Component.onCompleted: {
var usingUDP = controller.usingUDPLink() var usingUDP = controller.usingUDPLink()
if (usingUDP && !_wifiReliableForCalibration) { if (usingUDP && !_wifiReliableForCalibration) {
showMessage("Sensor Calibration", "Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.", StandardButton.Ok) showMessage(qsTr("Sensor Calibration"), qsTr("Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead."), StandardButton.Ok)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment