Skip to content

Q
qgroundcontrol
Commit def534a9 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Correct string marking for localization

parent 83d78b4a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 66 deletions
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @ def534a9
...@@ -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 }
} }
......
src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
View file @ def534a9
...@@ -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
......
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
View file @ def534a9
...@@ -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)
} }
......
src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml
View file @ def534a9
...@@ -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
......
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ def534a9
...@@ -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
......
src/AutoPilotPlugins/PX4/SensorsSetup.qml
View file @ def534a9
...@@ -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