diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml index e14305f2dbc42c3930160c9d4d55fe52f8ed182e..7eb8505f67e4c7370f6d92ba4076e60dee0751f6 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml @@ -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 } } diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml index 85c43474aa74ad466c176dd35b3f34c4afed329d..752951d0df72ce63401ac637baf06266b364e72e 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml @@ -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 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml index 4d2c2596185ae1140b4ed092d40d984a3609d400..907188f048a5a4db9ceb790434d08e5a10d42da6 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponent.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.qml @@ -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 // pre-calibration dialog. - readonly property string orientationHelpSet: "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 compassRotationText: "If the compass or GPS module is mounted in flight direction, leave the default value (None)" + readonly property string orientationHelpSet: qsTr("If the orientation is in the direction of flight, select None.") + readonly property string orientationHelpCal: qsTr("Before calibrating make sure orientation settings are correct. ") + orientationHelpSet + 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 gyroHelp: "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 levelHelp: "To level the horizon you need to place the vehicle in its level flight position and press OK." + readonly property string compassHelp: qsTr("For Compass calibration you will need to rotate your vehicle through a number of positions.") + 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: 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: 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 property string preCalibrationDialogHelp @@ -54,8 +54,8 @@ SetupPage { property string _postCalibrationDialogText property var _postCalibrationDialogParams - readonly property string _badCompassCalText: "The calibration for Compass %1 appears to be poor. " + - "Check the compass position within your vehicle and re-do the calibration." + readonly property string _badCompassCalText: qsTr("The calibration for Compass %1 appears to be poor. ") + + qsTr("Check the compass position within your vehicle and re-do the calibration.") readonly property int sideBarH1PointSize: ScreenTools.mediumFontPointSize readonly property int mainTextH1PointSize: ScreenTools.mediumFontPointSize // Seems to be unused @@ -157,7 +157,7 @@ SetupPage { var usingUDP = controller.usingUDPLink() var isSub = QGroundControl.multiVehicleManager.activeVehicle.sub; 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 { spacing: Math.round(ScreenTools.defaultFontPixelHeight / 4) QGCLabel { - text: "Compass " + (index+1) + " " + - (sensorParams.rgCompassPrimary[index] ? "(primary" : "(secondary") + + text: qsTr("Compass ") + (index+1) + " " + + (sensorParams.rgCompassPrimary[index] ? qsTr("(primary") : qsTr("(secondary")) + (sensorParams.rgCompassExternalParamAvailable[index] ? - (sensorParams.rgCompassExternal[index] ? ", external" : ", internal" ) : + (sensorParams.rgCompassExternal[index] ? qsTr(", external") : qsTr(", internal" )) : "") + ")" } FactCheckBox { - text: "Use Compass" + text: qsTr("Use Compass") fact: sensorParams.rgCompassUseFact[index] visible: sensorParams.rgCompassUseParamAvailable[index] && !sensorParams.rgCompassPrimary[index] } @@ -274,10 +274,10 @@ SetupPage { visible: sensorParams.rgCompassAvailable[index] QGCLabel { - text: "Compass " + (index+1) + " " + - (sensorParams.rgCompassPrimary[index] ? "(primary" : "(secondary") + + text: qsTr("Compass ") + (index+1) + " " + + (sensorParams.rgCompassPrimary[index] ? qsTr("(primary") :qsTr( "(secondary")) + (sensorParams.rgCompassExternalParamAvailable[index] ? - (sensorParams.rgCompassExternal[index] ? ", external" : ", internal" ) : + (sensorParams.rgCompassExternal[index] ? qsTr(", external") : qsTr(", internal") ) : "") + ")" } @@ -288,7 +288,7 @@ SetupPage { spacing: Math.round(ScreenTools.defaultFontPixelHeight / 4) FactCheckBox { - text: "Use Compass" + text: qsTr("Use Compass") fact: sensorParams.rgCompassUseFact[index] visible: sensorParams.rgCompassUseParamAvailable[index] && !sensorParams.rgCompassPrimary[index] } @@ -389,38 +389,38 @@ SetupPage { anchors.left: parent.left anchors.right: parent.right 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. " + - "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." + 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. ") + + qsTr("CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. ") + + qsTr("It is technically possible to set-up CompassMot using throttle but this is not recommended.") } QGCLabel { anchors.left: parent.left anchors.right: parent.right wrapMode: Text.WordWrap - text: "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." + text: qsTr("Disconnect your props, flip them over and rotate them one position around the frame. ") + + qsTr("In this configuration they should push the copter down into the ground when the throttle is raised.") } QGCLabel { anchors.left: parent.left anchors.right: parent.right 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 { anchors.left: parent.left anchors.right: parent.right 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 { anchors.left: parent.left anchors.right: parent.right wrapMode: Text.WordWrap - text: "Click Ok to start CompassMot calibration." + text: qsTr("Click Ok to start CompassMot calibration.") } } // Column } // QGCFlickable diff --git a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml index ae77d193d9a63212cdc64fbf4923b5588bd34e7e..78d057646314e3cb05e14639bdd22e04674b40cc 100644 --- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml +++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml @@ -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) } diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml index 525a2dc9ee93f5924662d2620d6b8a221390e3a6..40fa8ba467a70e50e9a4b0055b440494e68fdf78 100644 --- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml +++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml @@ -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 diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml index 5cb20f2e14a4844137b0478bda0c5295e9a3ed29..e7b05cb1c6e68703e2339bf35b2401b4a2105f00 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponent.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml @@ -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 diff --git a/src/AutoPilotPlugins/PX4/SensorsSetup.qml b/src/AutoPilotPlugins/PX4/SensorsSetup.qml index f6eceb94faeaf5e909e7b8a433f4a700d147b554..157dcd4da92eb2a7a9135d496b85601d1b8f6ce5 100644 --- a/src/AutoPilotPlugins/PX4/SensorsSetup.qml +++ b/src/AutoPilotPlugins/PX4/SensorsSetup.qml @@ -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) } }