Skip to content

Q
qgroundcontrol
Commit 011fe913 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5789 from DonLakeFlyer/StringLoc 

Full pass through all .qml files for correct string localization
parents b17d1c68 def534a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 238 deletions
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
View file @ 011fe913
......@@ -29,72 +29,6 @@ SetupPage {
property Fact _oldFrameParam: controller.getParameterFact(-1, "FRAME", false)
property Fact _newFrameParam: controller.getParameterFact(-1, "FRAME_CLASS", 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 {
......@@ -106,100 +40,6 @@ SetupPage {
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 {
id: oldFramePageComponent
......@@ -219,11 +59,6 @@ SetupPage {
text: qsTr("Please select your airframe type")
Layout.fillWidth: true
}
QGCButton {
text: qsTr("Load common parameters")
onClicked: showDialog(applyRestartDialogComponent, qsTr("Load common parameters"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
}
Repeater {
......@@ -254,7 +89,7 @@ SetupPage {
columns: 2
QGCLabel {
text: qsTr("Frame Class:")
text: qsTr("Frame Class:")
}
FactComboBox {
......@@ -264,7 +99,7 @@ SetupPage {
}
QGCLabel {
text: qsTr("Frame Type:")
text: qsTr("Frame Type:")
}
FactComboBox {
......@@ -272,11 +107,6 @@ SetupPage {
indexModel: false
width: ScreenTools.defaultFontPixelWidth * 15
}
QGCButton {
text: qsTr("Load common parameters")
onClicked: showDialog(selectParamFileDialogComponent, qsTr("Load common parameters"), qgcView.showDialogDefaultWidth, StandardButton.Close)
}
}
}
} // SetupPage
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @ 011fe913
......@@ -82,7 +82,7 @@ SetupPage {
}
ListElement {
text: "3DR Iris"
text: qsTr("3DR Iris")
voltPin: 2
currPin: 3
voltMult: 12.02
......@@ -113,7 +113,7 @@ SetupPage {
QGCLabel {
width: parent.width
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 {
......@@ -122,14 +122,14 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter
QGCLabel {
text: "Measured voltage:"
text: qsTr("Measured voltage:")
}
QGCTextField { id: measuredVoltage }
QGCLabel { text: "Vehicle voltage:" }
QGCLabel { text: qsTr("Vehicle voltage:") }
QGCLabel { text: controller.vehicle.battery.voltage.valueString }
QGCLabel { text: "Voltage multiplier:" }
QGCLabel { text: qsTr("Voltage multiplier:") }
FactLabel { fact: battVoltMult }
}
......@@ -171,7 +171,7 @@ SetupPage {
QGCLabel {
width: parent.width
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 {
......@@ -180,14 +180,14 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter
QGCLabel {
text: "Measured current:"
text: qsTr("Measured current:")
}
QGCTextField { id: measuredCurrent }
QGCLabel { text: "Vehicle current:" }
QGCLabel { text: qsTr("Vehicle current:") }
QGCLabel { text: controller.vehicle.battery.current.valueString }
QGCLabel { text: "Amps per volt:" }
QGCLabel { text: qsTr("Amps per volt:") }
FactLabel { fact: battAmpPerVolt }
}
......
src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
View file @ 011fe913
......@@ -127,7 +127,7 @@ SetupPage {
}
QGCLabel {
text: "Detector Pin:"
text: qsTr( "Detector Pin:")
width: failsafeSettings._labelWidth
visible: leakEnableCombo.currentIndex != 0
anchors.baseline: leakEnableCombo.baseline
......@@ -326,7 +326,7 @@ SetupPage {
}
QGCLabel {
text: "Threshold:"
text: qsTr("Threshold:")
width: failsafeSettings._labelWidth
visible: pressureEnableCombo.currentIndex != 0
anchors.baseline: pressureEnableCombo.baseline
......
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
View file @ 011fe913
......@@ -144,7 +144,7 @@ Item {
QGCLabel {
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)
}
......@@ -163,7 +163,7 @@ Item {
QGCLabel {
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)
}
......@@ -182,7 +182,7 @@ Item {
QGCLabel {
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)
}
......@@ -202,7 +202,7 @@ Item {
QGCLabel {
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)
}
......
src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml
View file @ 011fe913
......@@ -26,8 +26,8 @@ SetupPage {
sliderModel: ListModel {
ListElement {
title: "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."
title: qsTr("Roll sensitivity")
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"
min: 0.2
max: 0.8
......@@ -35,8 +35,8 @@ SetupPage {
}
ListElement {
title: "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."
title: qsTr("Pitch sensitivity")
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"
min: 0.2
max: 0.8
......@@ -44,8 +44,8 @@ SetupPage {
}
ListElement {
title: "Cruise throttle"
description: "This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%."
title: qsTr("Cruise throttle")
description: qsTr("This is the throttle setting required to achieve the desired cruise speed. Most planes need 50-60%.")
param: "FW_THR_CRUISE"
min: 20
max: 80
......@@ -53,8 +53,8 @@ SetupPage {
}
ListElement {
title: "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."
title: qsTr("Mission mode sensitivity")
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"
min: 12
max: 50
......
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ 011fe913
......@@ -118,7 +118,7 @@ SetupPage {
QGCLabel {
width: parent.width
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 {
......@@ -127,14 +127,14 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter
QGCLabel {
text: "Measured voltage:"
text: qsTr("Measured voltage:")
}
QGCTextField { id: measuredVoltage }
QGCLabel { text: "Vehicle voltage:" }
QGCLabel { text: qsTr("Vehicle voltage:") }
QGCLabel { text: controller.vehicle.battery.voltage.valueString }
QGCLabel { text: "Voltage divider:" }
QGCLabel { text: qsTr("Voltage divider:") }
FactLabel { fact: battVoltageDivider }
}
......@@ -176,7 +176,7 @@ SetupPage {
QGCLabel {
width: parent.width
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 {
......@@ -185,19 +185,19 @@ SetupPage {
verticalItemAlignment: Grid.AlignVCenter
QGCLabel {
text: "Measured current:"
text: qsTr("Measured current:")
}
QGCTextField { id: measuredCurrent }
QGCLabel { text: "Vehicle current:" }
QGCLabel { text: qsTr("Vehicle current:") }
QGCLabel { text: controller.vehicle.battery.current.valueString }
QGCLabel { text: "Amps per volt:" }
QGCLabel { text: qsTr("Amps per volt:") }
FactLabel { fact: battAmpsPerVolt }
}
QGCButton {
text: "Calculate"
text: qsTr("Calculate")
onClicked: {
var measuredCurrentValue = parseFloat(measuredCurrent.text)
......@@ -301,7 +301,7 @@ SetupPage {
QGCButton {
id: voltMultCalculateButton
text: "Calculate"
text: qsTr("Calculate")
onClicked: showDialog(calcVoltageDividerDlgComponent, qsTr("Calculate Voltage Divider"), powerPage.showDialogDefaultWidth, StandardButton.Close)
}
......@@ -313,8 +313,8 @@ SetupPage {
Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize
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. " +
"Click the Calculate button for help with calculating a new value."
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. ") +
qsTr("Click the Calculate button for help with calculating a new value.")
}
QGCLabel {
......@@ -329,7 +329,7 @@ SetupPage {
QGCButton {
id: ampPerVoltCalculateButton
text: "Calculate"
text: qsTr("Calculate")
onClicked: showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), powerPage.showDialogDefaultWidth, StandardButton.Close)
}
......@@ -341,8 +341,8 @@ SetupPage {
Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize
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. " +
"Click the Calculate button for help with calculating a new value."
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. ") +
qsTr("Click the Calculate button for help with calculating a new value.")
}
} // Grid
} // QGCGroupBox - Battery settings
......
src/AutoPilotPlugins/PX4/SensorsSetup.qml
View file @ 011fe913
......@@ -150,7 +150,7 @@ Item {
Component.onCompleted: {
var usingUDP = controller.usingUDPLink()
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