From b8d13084f48ebc06ab6467f46c83c1d3b8160956 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 4 Apr 2016 17:56:16 -0300 Subject: [PATCH] Added missing qsTr on QML files Signed-off-by: Tomaz Canabrava --- src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml | 2 +- src/FlightDisplay/FlightDisplayViewWidgets.qml | 4 ++-- src/FlightMap/Widgets/QGCCompassWidget.qml | 2 +- src/FlightMap/Widgets/ValuesWidget.qml | 8 ++++---- src/MissionEditor/MissionItemStatus.qml | 1 + src/MissionEditor/SimpleItemEditor.qml | 2 +- src/MissionEditor/SurveyItemEditor.qml | 8 ++++---- src/QmlControls/MissionItemEditor.qml | 2 +- src/QmlControls/ParameterEditor.qml | 6 +++--- src/QmlControls/ParameterEditorDialog.qml | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml index 791c70312..28c4af97e 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml @@ -31,7 +31,7 @@ FactPanel { VehicleSummaryRow { labelText: qsTr("Compass 0:") - valueText: mag0IdFact ? (mag0IdFact.value === 0 ? qsTr("Setup required") : ("Ready")) : "" + valueText: mag0IdFact ? (mag0IdFact.value === 0 ? qsTr("Setup required") : qsTr("Ready")) : "" } VehicleSummaryRow { diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml index 56b32623b..81b182ab1 100644 --- a/src/FlightDisplay/FlightDisplayViewWidgets.qml +++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml @@ -75,7 +75,7 @@ Item { z: QGroundControl.zOrderTopMost color: mapPal.text font.pixelSize: ScreenTools.largeFontPixelSize - text: "No GPS Lock for Vehicle" + text: qsTr("No GPS Lock for Vehicle") } QGCLabel { @@ -421,7 +421,7 @@ Item { guidedModeConfirm.confirmText = qsTr("land") break; case confirmHome: - guidedModeConfirm.confirmText = "return to launch" + guidedModeConfirm.confirmText = qsTr("return to launch") break; case confirmChangeAlt: altitudeSlider.visible = true diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml index d10a23b14..5a7635c1e 100644 --- a/src/FlightMap/Widgets/QGCCompassWidget.qml +++ b/src/FlightMap/Widgets/QGCCompassWidget.qml @@ -89,7 +89,7 @@ Item { color: Qt.rgba(0,0,0,0.65) QGCLabel { - text: active ? heading.toFixed(0) : "OFF" + text: active ? heading.toFixed(0) : qsTr("OFF") font.weight: active ? Font.DemiBold : Font.Light font.pixelSize: _fontSize < 1 ? 1 : _fontSize; color: "white" diff --git a/src/FlightMap/Widgets/ValuesWidget.qml b/src/FlightMap/Widgets/ValuesWidget.qml index 0e275e52a..d8e8836b6 100644 --- a/src/FlightMap/Widgets/ValuesWidget.qml +++ b/src/FlightMap/Widgets/ValuesWidget.qml @@ -52,7 +52,7 @@ QGCFlickable { } function showPicker() { - qgcView.showDialog(propertyPicker, "Value Widget Setup", qgcView.showDialogDefaultWidth, StandardButton.Ok) + qgcView.showDialog(propertyPicker, qsTr("Value Widget Setup"), qgcView.showDialogDefaultWidth, StandardButton.Ok) } function listContains(list, value) { @@ -163,7 +163,7 @@ QGCFlickable { QGCLabel { id: _label - text: "Select the values you want to display:" + text: qsTr("Select the values you want to display:") } Loader { @@ -195,7 +195,7 @@ QGCFlickable { QGCLabel { width: parent.width wrapMode: Text.WordWrap - text: factGroup ? factGroupName : "Vehicle must be connected to assign values." + text: factGroup ? factGroupName : qsTr("Vehicle must be connected to assign values.") } Repeater { @@ -254,7 +254,7 @@ QGCFlickable { QGCCheckBox { id: _largeCheckBox - text: "large" + text: qsTr("large") checked: listContains(controller.largeValues, propertyName) enabled: _addCheckBox.checked onClicked: updateValues() diff --git a/src/MissionEditor/MissionItemStatus.qml b/src/MissionEditor/MissionItemStatus.qml index 1851f1d73..0819aa004 100644 --- a/src/MissionEditor/MissionItemStatus.qml +++ b/src/MissionEditor/MissionItemStatus.qml @@ -82,6 +82,7 @@ Rectangle { QGCLabel { text: qsTr("Azimuth:") } QGCLabel { text: _azimuthText } + } QGCFlickable { anchors.leftMargin: _margins diff --git a/src/MissionEditor/SimpleItemEditor.qml b/src/MissionEditor/SimpleItemEditor.qml index 8141913e2..d4a213a6c 100644 --- a/src/MissionEditor/SimpleItemEditor.qml +++ b/src/MissionEditor/SimpleItemEditor.qml @@ -114,7 +114,7 @@ Rectangle { } QGCButton { - text: "Move Home to map center" + text: qsTr("Move Home to map center") visible: missionItem.homePosition onClicked: editorRoot.moveHomeToMapCenter() anchors.horizontalCenter: parent.horizontalCenter diff --git a/src/MissionEditor/SurveyItemEditor.qml b/src/MissionEditor/SurveyItemEditor.qml index 579b5e96b..e0d4a153f 100644 --- a/src/MissionEditor/SurveyItemEditor.qml +++ b/src/MissionEditor/SurveyItemEditor.qml @@ -73,7 +73,7 @@ Rectangle { QGCCheckBox { anchors.left: parent.left - text: "Relative altitude" + text: qsTr("Relative altitude") checked: missionItem.gridAltitudeRelative onClicked: missionItem.gridAltitudeRelative = checked } @@ -81,7 +81,7 @@ Rectangle { QGCCheckBox { id: cameraTrigger anchors.left: parent.left - text: "Camera trigger:" + text: qsTr("Camera trigger:") checked: missionItem.cameraTrigger onClicked: missionItem.cameraTrigger = checked } @@ -96,7 +96,7 @@ Rectangle { QGCLabel { anchors.baseline: textField.baseline anchors.left: parent.left - text: "Distance:" + text: qsTr("Distance:") } FactTextField { @@ -109,7 +109,7 @@ Rectangle { } QGCButton { - text: _addPointsMode ? "Finish Polygon" : "Draw Polygon" + text: _addPointsMode ? qsTr("Finish Polygon") : qsTr("Draw Polygon") onClicked: { if (_addPointsMode) { _addPointsMode = false diff --git a/src/QmlControls/MissionItemEditor.qml b/src/QmlControls/MissionItemEditor.qml index 540645fc9..80400b00b 100644 --- a/src/QmlControls/MissionItemEditor.qml +++ b/src/QmlControls/MissionItemEditor.qml @@ -140,7 +140,7 @@ Rectangle { anchors.fill: commandPicker visible: missionItem.sequenceNumber == 0 || !missionItem.isCurrentItem || !missionItem.isSimpleItem verticalAlignment: Text.AlignVCenter - text: missionItem.sequenceNumber == 0 ? "Home Position" : (missionItem.isSimpleItem ? missionItem.commandName : "Survey") + text: missionItem.sequenceNumber == 0 ? qsTr("Home Position") : (missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey")) color: _outerTextColor } diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 6e8604adc..0fea97ddb 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -330,7 +330,7 @@ QGCView { acceptedButtons: Qt.LeftButton onClicked: { _editorDialogFact = factRow.modelFact - showDialog(editorDialogComponent, "Parameter Editor", qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Save) + showDialog(editorDialogComponent, qsTr("Parameter Editor"), qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Save) } } } @@ -365,7 +365,7 @@ QGCView { QGCLabel { id: searchForLabel - text: "Search for:" + text: qsTr("Search for:") } QGCTextField { @@ -380,7 +380,7 @@ QGCView { anchors.top: searchFor.bottom width: parent.width wrapMode: Text.WordWrap - text: "Hint: Leave 'Search For' blank and click Apply to list all parameters sorted by name." + text: qsTr("Hint: Leave 'Search For' blank and click Apply to list all parameters sorted by name.") } } } diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml index e357c5ef9..12a00ff3c 100644 --- a/src/QmlControls/ParameterEditorDialog.qml +++ b/src/QmlControls/ParameterEditorDialog.qml @@ -85,7 +85,7 @@ QGCViewDialog { QGCLabel { width: parent.width wrapMode: Text.WordWrap - text: fact.shortDescription ? fact.shortDescription : "Description missing" + text: fact.shortDescription ? fact.shortDescription : qsTr("Description missing") } QGCLabel { -- 2.22.0