From 5f005e5734d466763356cf80371b741b3c19ea8f Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 24 Mar 2016 18:43:42 -0300 Subject: [PATCH] More qsTr aditions Signed-off-by: Tomaz Canabrava --- src/ui/MainWindowInner.qml | 10 ++--- src/ui/MainWindowLeftPanel.qml | 14 +++---- src/ui/preferences/BluetoothSettings.qml | 14 +++---- src/ui/preferences/DebugWindow.qml | 18 ++++----- src/ui/preferences/GeneralSettings.qml | 48 ++++++++++++------------ src/ui/preferences/LinkSettings.qml | 24 ++++++------ src/ui/preferences/LogReplaySettings.qml | 8 ++-- src/ui/preferences/MavlinkSettings.qml | 10 ++--- src/ui/preferences/MockLink.qml | 12 +++--- src/ui/preferences/MockLinkSettings.qml | 16 ++++---- src/ui/preferences/SerialSettings.qml | 20 +++++----- 11 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml index 02b8cdf08..efe616166 100644 --- a/src/ui/MainWindowInner.qml +++ b/src/ui/MainWindowInner.qml @@ -124,8 +124,8 @@ Item { MessageDialog { id: unsavedMissionCloseDialog - title: "QGroundControl close" - text: "You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?" + title: qsTr("QGroundControl close") + text: qsTr("You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?") standardButtons: StandardButton.Yes | StandardButton.No modality: Qt.ApplicationModal visible: false @@ -143,8 +143,8 @@ Item { MessageDialog { id: activeConnectionsCloseDialog - title: "QGroundControl close" - text: "There are still active connections to vehicles. Do you want to disconnect these before closing?" + title: qsTr("QGroundControl close") + text: qsTr("There are still active connections to vehicles. Do you want to disconnect these before closing?") standardButtons: StandardButton.Yes | StandardButton.Cancel modality: Qt.ApplicationModal visible: false @@ -238,7 +238,7 @@ Item { messageFlick.flick(0,-5000) activeVehicle.resetMessages() } else { - messageText.text = "No Messages" + messageText.text = qsTr("No Messages") } currentPopUp = messageArea messageArea.visible = true diff --git a/src/ui/MainWindowLeftPanel.qml b/src/ui/MainWindowLeftPanel.qml index 1ba07a0a6..2e7069d1b 100644 --- a/src/ui/MainWindowLeftPanel.qml +++ b/src/ui/MainWindowLeftPanel.qml @@ -158,14 +158,14 @@ Item { spacing: ScreenTools.defaultFontPixelHeight QGCLabel { - text: "Preferences" + text: qsTr("Preferences") anchors.horizontalCenter: parent.horizontalCenter } QGCButton { anchors.left: parent.left anchors.right: parent.right - text: "General" + text: qsTr("General") exclusiveGroup: panelActionGroup onClicked: { if(__rightPanel.source != "GeneralSettings.qml") { @@ -178,7 +178,7 @@ Item { QGCButton { anchors.left: parent.left anchors.right: parent.right - text: "Comm Links" + text: qsTr("Comm Links") exclusiveGroup: panelActionGroup onClicked: { if(__rightPanel.source != "LinkSettings.qml") { @@ -191,7 +191,7 @@ Item { QGCButton { anchors.left: parent.left anchors.right: parent.right - text: "Offline Maps" + text: qsTr("Offline Maps") exclusiveGroup: panelActionGroup onClicked: { if(__rightPanel.source != "OfflineMap.qml") { @@ -204,7 +204,7 @@ Item { QGCButton { anchors.left: parent.left anchors.right: parent.right - text: "MavLink" + text: qsTr("MavLink") exclusiveGroup: panelActionGroup onClicked: { if(__rightPanel.source != "MavlinkSettings.qml") { @@ -230,7 +230,7 @@ Item { QGCButton { anchors.left: parent.left anchors.right: parent.right - text: "Mock Link" + text: qsTr("Mock Link") visible: ScreenTools.isDebug exclusiveGroup: panelActionGroup onClicked: { @@ -244,7 +244,7 @@ Item { QGCButton { anchors.left: parent.left anchors.right: parent.right - text: "Debug" + text: qsTr("Debug") visible: ScreenTools.isDebug exclusiveGroup: panelActionGroup onClicked: { diff --git a/src/ui/preferences/BluetoothSettings.qml b/src/ui/preferences/BluetoothSettings.qml index 512b5d04e..8b0515635 100644 --- a/src/ui/preferences/BluetoothSettings.qml +++ b/src/ui/preferences/BluetoothSettings.qml @@ -40,7 +40,7 @@ Item { } QGCLabel { - text: "Bluetooth Not Available" + text: qsTr("Bluetooth Not Available") visible: !QGroundControl.linkManager.isBluetoothAvailable anchors.centerIn: parent } @@ -59,7 +59,7 @@ Item { QGCLabel { id: btLabel - text: "Bluetooth Link Settings" + text: qsTr("Bluetooth Link Settings") } Rectangle { height: 1 @@ -73,7 +73,7 @@ Item { Row { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Device:" + text: qsTr("Device:") width: _firstColumn } QGCLabel { @@ -85,7 +85,7 @@ Item { visible: !ScreenTools.isiOS spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Address:" + text: qsTr("Address:") width: _firstColumn } QGCLabel { @@ -98,7 +98,7 @@ Item { width: parent.width } QGCLabel { - text: "Bluetooth Devices:" + text: qsTr("Bluetooth Devices:") } Item { width: hostRow.width @@ -152,7 +152,7 @@ Item { anchors.horizontalCenter: parent.horizontalCenter QGCButton { width: ScreenTools.defaultFontPixelWidth * 10 - text: "Scan" + text: qsTr("Scan") enabled: subEditConfig && subEditConfig.linkType === LinkConfiguration.TypeBluetooth && !subEditConfig.scanning onClicked: { if(subEditConfig) @@ -161,7 +161,7 @@ Item { } QGCButton { width: ScreenTools.defaultFontPixelWidth * 10 - text: "Stop" + text: qsTr("Stop") enabled: subEditConfig && subEditConfig.linkType === LinkConfiguration.TypeBluetooth && subEditConfig.scanning onClicked: { if(subEditConfig) diff --git a/src/ui/preferences/DebugWindow.qml b/src/ui/preferences/DebugWindow.qml index ced76871d..5cdd8931c 100644 --- a/src/ui/preferences/DebugWindow.qml +++ b/src/ui/preferences/DebugWindow.qml @@ -55,7 +55,7 @@ QGCView { anchors.left: parent.left columns: 2 Text { - text: "Qt Platform:" + text: qsTr("Qt Platform:") color: qgcPal.text } Text { @@ -63,7 +63,7 @@ QGCView { color: qgcPal.text } Text { - text: "Default font width:" + text: qsTr("Default font width:") color: qgcPal.text } Text { @@ -71,7 +71,7 @@ QGCView { color: qgcPal.text } Text { - text: "Default font height:" + text: qsTr("Default font height:") color: qgcPal.text } Text { @@ -79,7 +79,7 @@ QGCView { color: qgcPal.text } Text { - text: "Default font pixel size:" + text: qsTr("Default font pixel size:") color: qgcPal.text } Text { @@ -87,7 +87,7 @@ QGCView { color: qgcPal.text } Text { - text: "Default font point size:" + text: qsTr("Default font point size:") color: qgcPal.text } Text { @@ -95,7 +95,7 @@ QGCView { color: qgcPal.text } Text { - text: "QML Screen Desktop:" + text: qsTr("QML Screen Desktop:") color: qgcPal.text } Text { @@ -103,7 +103,7 @@ QGCView { color: qgcPal.text } Text { - text: "QML Screen Size:" + text: qsTr("QML Screen Size:") color: qgcPal.text } Text { @@ -111,7 +111,7 @@ QGCView { color: qgcPal.text } Text { - text: "QML Pixel Density:" + text: qsTr("QML Pixel Density:") color: qgcPal.text } Text { @@ -119,7 +119,7 @@ QGCView { color: qgcPal.text } Text { - text: "QML Pixel Ratio:" + text: qsTr("QML Pixel Ratio:") color: qgcPal.text } Text { diff --git a/src/ui/preferences/GeneralSettings.qml b/src/ui/preferences/GeneralSettings.qml index 20aceb88e..e346a33b8 100644 --- a/src/ui/preferences/GeneralSettings.qml +++ b/src/ui/preferences/GeneralSettings.qml @@ -56,7 +56,7 @@ Rectangle { spacing: ScreenTools.defaultFontPixelHeight / 2 QGCLabel { - text: "General Settings" + text: qsTr("General Settings") font.pixelSize: ScreenTools.mediumFontPixelSize } Rectangle { @@ -78,7 +78,7 @@ Rectangle { QGCLabel { id: distanceUnitsLabel anchors.baseline: distanceUnitsCombo.baseline - text: "Distance units:" + text: qsTr("Distance units:") } FactComboBox { @@ -90,7 +90,7 @@ Rectangle { QGCLabel { anchors.baseline: distanceUnitsCombo.baseline - text: "(requires reboot to take affect)" + text: qsTr("(requires reboot to take affect)") } } @@ -101,7 +101,7 @@ Rectangle { QGCLabel { anchors.baseline: speedUnitsCombo.baseline width: distanceUnitsLabel.width - text: "Speed units:" + text: qsTr("Speed units:") } FactComboBox { @@ -113,14 +113,14 @@ Rectangle { QGCLabel { anchors.baseline: speedUnitsCombo.baseline - text: "(requires reboot to take affect)" + text: qsTr("(requires reboot to take affect)") } } //----------------------------------------------------------------- //-- Audio preferences QGCCheckBox { - text: "Mute all audio output" + text: qsTr("Mute all audio output") checked: QGroundControl.isAudioMuted onClicked: { QGroundControl.isAudioMuted = checked @@ -130,7 +130,7 @@ Rectangle { //-- Prompt Save Log QGCCheckBox { id: promptSaveLog - text: "Prompt to save Flight Data Log after each flight" + text: qsTr("Prompt to save Flight Data Log after each flight") checked: QGroundControl.isSaveLogPrompt visible: !ScreenTools.isMobile onClicked: { @@ -140,7 +140,7 @@ Rectangle { //----------------------------------------------------------------- //-- Prompt Save even if not armed QGCCheckBox { - text: "Prompt to save Flight Data Log even if vehicle was not armed" + text: qsTr("Prompt to save Flight Data Log even if vehicle was not armed") checked: QGroundControl.isSaveLogPromptNotArmed visible: !ScreenTools.isMobile enabled: promptSaveLog.checked @@ -152,7 +152,7 @@ Rectangle { //-- Clear settings QGCCheckBox { id: clearCheck - text: "Clear all settings on next start" + text: qsTr("Clear all settings on next start") checked: false onClicked: { checked ? clearDialog.visible = true : QGroundControl.clearDeleteAllSettingsNextBoot() @@ -162,8 +162,8 @@ Rectangle { visible: false icon: StandardIcon.Warning standardButtons: StandardButton.Yes | StandardButton.No - title: "Clear Settings" - text: "All saved settings will be reset the next time you start QGroundControl. Is this really what you want?" + title: qsTr("Clear Settings") + text: qsTr("All saved settings will be reset the next time you start QGroundControl. Is this really what you want?") onYes: { QGroundControl.deleteAllSettingsNextBoot() clearDialog.visible = false @@ -182,7 +182,7 @@ Rectangle { QGCCheckBox { id: announcePercentCheckbox anchors.baseline: announcePercent.baseline - text: "Announce battery percent lower than:" + text: qsTr("Announce battery percent lower than:") checked: _percentRemainingAnnounce.value != 0 onClicked: { @@ -212,7 +212,7 @@ Rectangle { QGCLabel { anchors.baseline: mapProviders.baseline width: ScreenTools.defaultFontPixelWidth * 16 - text: "Map Providers:" + text: qsTr("Map Providers:") } QGCComboBox { id: mapProviders @@ -221,7 +221,7 @@ Rectangle { Component.onCompleted: { var index = mapProviders.find(QGroundControl.flightMapSettings.mapProvider) if (index < 0) { - console.warn("Active map provider not in combobox", QGroundControl.flightMapSettings.mapProvider) + console.warn(qsTr("Active map provider not in combobox"), QGroundControl.flightMapSettings.mapProvider) } else { mapProviders.currentIndex = index } @@ -229,7 +229,7 @@ Rectangle { onActivated: { if (index != -1) { currentIndex = index - console.log("New map provider: " + model[index]) + console.log(qsTr("New map provider: ") + model[index]) QGroundControl.flightMapSettings.mapProvider = model[index] } } @@ -242,12 +242,12 @@ Rectangle { QGCLabel { anchors.baseline: paletteCombo.baseline width: ScreenTools.defaultFontPixelWidth * 16 - text: "Style:" + text: qsTr("Style:") } QGCComboBox { id: paletteCombo width: ScreenTools.defaultFontPixelWidth * 16 - model: [ "Indoor", "Outdoor" ] + model: [ qsTr("Indoor"), qsTr("Outdoor") ] currentIndex: QGroundControl.isDarkStyle ? 0 : 1 onActivated: { if (index != -1) { @@ -271,28 +271,28 @@ Rectangle { spacing: ScreenTools.defaultFontPixelWidth * 2 QGCCheckBox { - text: "Pixhawk" + text: qsTr("Pixhawk") visible: !ScreenTools.isiOS checked: QGroundControl.linkManager.autoconnectPixhawk onClicked: QGroundControl.linkManager.autoconnectPixhawk = checked } QGCCheckBox { - text: "SiK Radio" + text: qsTr("SiK Radio") visible: !ScreenTools.isiOS checked: QGroundControl.linkManager.autoconnect3DRRadio onClicked: QGroundControl.linkManager.autoconnect3DRRadio = checked } QGCCheckBox { - text: "PX4 Flow" + text: qsTr("PX4 Flow") visible: !ScreenTools.isiOS checked: QGroundControl.linkManager.autoconnectPX4Flow onClicked: QGroundControl.linkManager.autoconnectPX4Flow = checked } QGCCheckBox { - text: "UDP" + text: qsTr("UDP") checked: QGroundControl.linkManager.autoconnectUDP onClicked: QGroundControl.linkManager.autoconnectUDP = checked } @@ -306,7 +306,7 @@ Rectangle { //----------------------------------------------------------------- //-- Virtual joystick settings QGCCheckBox { - text: "Virtual Joystick" + text: qsTr("Virtual Joystick") checked: QGroundControl.virtualTabletJoystick onClicked: QGroundControl.virtualTabletJoystick = checked } @@ -322,7 +322,7 @@ Rectangle { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Offline mission editing vehicle type:" + text: qsTr("Offline mission editing vehicle type:") anchors.baseline: offlineTypeCombo.baseline } @@ -342,7 +342,7 @@ Rectangle { //----------------------------------------------------------------- //-- Experimental Survey settings QGCCheckBox { - text: "Experimental Survey [WIP - no bugs reports please]" + text: qsTr("Experimental Survey [WIP - no bugs reports please]") checked: QGroundControl.experimentalSurvey onClicked: QGroundControl.experimentalSurvey = checked } diff --git a/src/ui/preferences/LinkSettings.qml b/src/ui/preferences/LinkSettings.qml index 12e05a20c..05e1ba159 100644 --- a/src/ui/preferences/LinkSettings.qml +++ b/src/ui/preferences/LinkSettings.qml @@ -73,7 +73,7 @@ Rectangle { anchors.margins: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelHeight / 2 QGCLabel { - text: "Comm Link Settings" + text: qsTr("Comm Link Settings") font.pixelSize: ScreenTools.mediumFontPixelSize } Rectangle { @@ -110,7 +110,7 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter QGCButton { width: ScreenTools.defaultFontPixelWidth * 10 - text: "Delete" + text: qsTr("Delete") enabled: _currentSelection && !_currentSelection.dynamic onClicked: { if(_currentSelection) @@ -121,8 +121,8 @@ Rectangle { visible: false icon: StandardIcon.Warning standardButtons: StandardButton.Yes | StandardButton.No - title: "Remove Link Configuration" - text: _currentSelection ? "Remove " + _currentSelection.name + ". Is this really what you want?" : "" + title: qsTr("Remove Link Configuration") + text: _currentSelection ? qsTr("Remove %1. Is this really what you want?").arg(_currentSelection.name) : "" onYes: { if(_currentSelection) QGroundControl.linkManager.removeConfiguration(_currentSelection) @@ -134,20 +134,20 @@ Rectangle { } } QGCButton { - text: "Edit" + text: qsTr("Edit") enabled: _currentSelection && !_currentSelection.link onClicked: { _linkRoot.openCommSettings(_currentSelection) } } QGCButton { - text: "Add" + text: qsTr("Add") onClicked: { _linkRoot.openCommSettings(null) } } QGCButton { - text: "Connect" + text: qsTr("Connect") enabled: _currentSelection && !_currentSelection.link onClicked: { QGroundControl.linkManager.createConnectedLink(_currentSelection) @@ -155,7 +155,7 @@ Rectangle { } } QGCButton { - text: "Disconnect" + text: qsTr("Disconnect") enabled: _currentSelection && _currentSelection.link onClicked: { QGroundControl.linkManager.disconnectLink(_currentSelection.link, false) @@ -213,7 +213,7 @@ Rectangle { anchors.margins: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelHeight / 2 QGCLabel { - text: linkConfig ? "Edit Link Configuration Settings (WIP)" : "Create New Link Configuration (WIP)" + text: linkConfig ? qsTr("Edit Link Configuration Settings (WIP)") : qsTr("Create New Link Configuration (WIP)") font.pixelSize: ScreenTools.mediumFontPixelSize } Rectangle { @@ -228,7 +228,7 @@ Rectangle { Row { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Name:" + text: qsTr("Name:") width: _firstColumn anchors.verticalCenter: parent.verticalCenter } @@ -242,7 +242,7 @@ Rectangle { Row { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Type:" + text: qsTr("Type:") width: _firstColumn anchors.verticalCenter: parent.verticalCenter } @@ -354,7 +354,7 @@ Rectangle { } QGCButton { width: ScreenTools.defaultFontPixelWidth * 10 - text: "Cancel" + text: qsTr("Cancel") onClicked: { QGroundControl.linkManager.cancelConfigurationEditing(editConfig) editConfig = null diff --git a/src/ui/preferences/LogReplaySettings.qml b/src/ui/preferences/LogReplaySettings.qml index 8c61dcd4b..e5ea88eaa 100644 --- a/src/ui/preferences/LogReplaySettings.qml +++ b/src/ui/preferences/LogReplaySettings.qml @@ -45,7 +45,7 @@ Item { width: parent.width spacing: ScreenTools.defaultFontPixelHeight / 2 QGCLabel { - text: "Log Replay Link Settings" + text: qsTr("Log Replay Link Settings") } Item { height: ScreenTools.defaultFontPixelHeight / 2 @@ -54,7 +54,7 @@ Item { Row { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Log File:" + text: qsTr("Log File:") width: _firstColumn anchors.verticalCenter: parent.verticalCenter } @@ -65,7 +65,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } QGCButton { - text: "Browse" + text: qsTr("Browse") onClicked: { fileDialog.visible = true } @@ -73,7 +73,7 @@ Item { } FileDialog { id: fileDialog - title: "Please choose a file" + title: qsTr("Please choose a file") folder: shortcuts.home visible: false selectExisting: true diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml index b15ad0962..e82be6a04 100644 --- a/src/ui/preferences/MavlinkSettings.qml +++ b/src/ui/preferences/MavlinkSettings.qml @@ -54,7 +54,7 @@ Rectangle { anchors.left: parent.left anchors.top: parent.top QGCLabel { - text: "MavLink Settings" + text: qsTr("MavLink Settings") font.pixelSize: ScreenTools.mediumFontPixelSize } Rectangle { @@ -67,7 +67,7 @@ Rectangle { Row { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Ground Station MavLink System ID:" + text: qsTr("Ground Station MavLink System ID:") anchors.verticalCenter: parent.verticalCenter } QGCTextField { @@ -84,7 +84,7 @@ Rectangle { //----------------------------------------------------------------- //-- Mavlink Heartbeats QGCCheckBox { - text: "Emit heartbeat" + text: qsTr("Emit heartbeat") checked: QGroundControl.multiVehicleManager.gcsHeartBeatEnabled onClicked: { QGroundControl.multiVehicleManager.gcsHeartBeatEnabled = checked @@ -93,7 +93,7 @@ Rectangle { //----------------------------------------------------------------- //-- Mavlink Multiplexing QGCCheckBox { - text: "Enable multiplexing (forward packets to all other links)" + text: qsTr("Enable multiplexing (forward packets to all other links)") checked: QGroundControl.isMultiplexingEnabled onClicked: { QGroundControl.isMultiplexingEnabled = checked @@ -102,7 +102,7 @@ Rectangle { //----------------------------------------------------------------- //-- Mavlink Version Check QGCCheckBox { - text: "Only accept MAVs with same protocol version" + text: qsTr("Only accept MAVs with same protocol version") checked: QGroundControl.isVersionCheckEnabled onClicked: { QGroundControl.isVersionCheckEnabled = checked diff --git a/src/ui/preferences/MockLink.qml b/src/ui/preferences/MockLink.qml index 0f1e4a3ca..12eab3f98 100644 --- a/src/ui/preferences/MockLink.qml +++ b/src/ui/preferences/MockLink.qml @@ -50,27 +50,27 @@ Rectangle { spacing: ScreenTools.defaultFontPixelHeight QGCButton { - text: "PX4 Vehicle" + text: qsTr("PX4 Vehicle") onClicked: QGroundControl.startPX4MockLink(sendStatusText.checked) } QGCButton { - text: "APM ArduCopter Vehicle" + text: qsTr("APM ArduCopter Vehicle") onClicked: QGroundControl.startAPMArduCopterMockLink(sendStatusText.checked) } QGCButton { - text: "APM ArduPlane Vehicle" + text: qsTr("APM ArduPlane Vehicle") onClicked: QGroundControl.startAPMArduPlaneMockLink(sendStatusText.checked) } QGCButton { - text: "Generic Vehicle" + text: qsTr("Generic Vehicle") onClicked: QGroundControl.startGenericMockLink(sendStatusText.checked) } QGCCheckBox { id: sendStatusText - text: "Send status text + voice" + text: qsTr("Send status text + voice") } QGCButton { - text: "Stop All MockLinks" + text: qsTr("Stop All MockLinks") onClicked: QGroundControl.stopAllMockLinks() } } diff --git a/src/ui/preferences/MockLinkSettings.qml b/src/ui/preferences/MockLinkSettings.qml index 3cbd89a8c..a3d3f34f8 100644 --- a/src/ui/preferences/MockLinkSettings.qml +++ b/src/ui/preferences/MockLinkSettings.qml @@ -64,7 +64,7 @@ Item { width: mockLinkSettings.width spacing: ScreenTools.defaultFontPixelHeight / 2 QGCLabel { - text: "Mock Link Settings" + text: qsTr("Mock Link Settings") } Item { height: ScreenTools.defaultFontPixelHeight / 2 @@ -72,7 +72,7 @@ Item { } QGCCheckBox { id: sendStatus - text: "Send Status Text and Voice" + text: qsTr("Send Status Text and Voice") checked: false } Item { @@ -83,19 +83,19 @@ Item { ExclusiveGroup { id: autoPilotGroup } QGCRadioButton { id: px4Firmware - text: "PX4 Firmware" + text: qsTr("PX4 Firmware") checked: false exclusiveGroup: autoPilotGroup } QGCRadioButton { id: apmFirmware - text: "APM Firmware" + text: qsTr("APM Firmware") checked: false exclusiveGroup: autoPilotGroup } QGCRadioButton { id: genericFirmware - text: "Generic Firmware" + text: qsTr("Generic Firmware") checked: false exclusiveGroup: autoPilotGroup } @@ -105,7 +105,7 @@ Item { width: parent.width } QGCLabel { - text: "APM Vehicle Type" + text: qsTr("APM Vehicle Type") visible: apmFirmware.checked } ColumnLayout { @@ -113,13 +113,13 @@ Item { ExclusiveGroup { id: apmVehicleGroup } QGCRadioButton { id: copterVehicle - text: "ArduCopter" + text: qsTr("ArduCopter") checked: false exclusiveGroup: apmVehicleGroup } QGCRadioButton { id: planeVehicle - text: "ArduPlane" + text: qsTr("ArduPlane") checked: false exclusiveGroup: apmVehicleGroup } diff --git a/src/ui/preferences/SerialSettings.qml b/src/ui/preferences/SerialSettings.qml index 06f4465ef..c9869de47 100644 --- a/src/ui/preferences/SerialSettings.qml +++ b/src/ui/preferences/SerialSettings.qml @@ -45,7 +45,7 @@ Item { spacing: ScreenTools.defaultFontPixelHeight / 2 QGCLabel { id: serialLabel - text: "Serial Link Settings" + text: qsTr("Serial Link Settings") } Rectangle { height: 1 @@ -59,7 +59,7 @@ Item { Row { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Serial Port:" + text: qsTr("Serial Port:") width: _firstColumn anchors.verticalCenter: parent.verticalCenter } @@ -79,7 +79,7 @@ Item { subEditConfig.portName = QGroundControl.linkManager.serialPorts[0] var index = commPortCombo.find(subEditConfig.portDisplayName) if (index === -1) { - console.warn("Serial Port not present", subEditConfig.portName) + console.warn(qsTr("Serial Port not present"), subEditConfig.portName) } else { commPortCombo.currentIndex = index } @@ -92,7 +92,7 @@ Item { Row { spacing: ScreenTools.defaultFontPixelWidth QGCLabel { - text: "Baud Rate:" + text: qsTr("Baud Rate:") width: _firstColumn anchors.verticalCenter: parent.verticalCenter } @@ -113,7 +113,7 @@ Item { } var index = baudCombo.find(baud) if (index === -1) { - console.warn("Baud rate name not in combo box", baud) + console.warn(qsTr("Baud rate name not in combo box"), baud) } else { baudCombo.currentIndex = index } @@ -128,7 +128,7 @@ Item { //-- Advanced Serial Settings QGCCheckBox { id: showAdvanced - text: "Show Advanced Serial Settings" + text: qsTr("Show Advanced Serial Settings") } Item { height: ScreenTools.defaultFontPixelHeight / 2 @@ -136,7 +136,7 @@ Item { } //-- Flow Control QGCCheckBox { - text: "Enable Flow Control" + text: qsTr("Enable Flow Control") checked: subEditConfig ? subEditConfig.flowControl !== 0 : false visible: showAdvanced.checked onCheckedChanged: { @@ -150,14 +150,14 @@ Item { spacing: ScreenTools.defaultFontPixelWidth visible: showAdvanced.checked QGCLabel { - text: "Parity:" + text: qsTr("Parity:") width: _firstColumn anchors.verticalCenter: parent.verticalCenter } QGCComboBox { id: parityCombo width: _firstColumn - model: ["None", "Even", "Odd"] + model: [qsTr("None"), qsTr("Even"), qsTr("Odd")] anchors.verticalCenter: parent.verticalCenter onActivated: { if (index != -1) { @@ -217,7 +217,7 @@ Item { spacing: ScreenTools.defaultFontPixelWidth visible: showAdvanced.checked QGCLabel { - text: "Stop Bits:" + text: qsTr("Stop Bits:") width: _firstColumn anchors.verticalCenter: parent.verticalCenter } -- 2.22.0