Commit 7a2fa7d3 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #4182 from dogmaphobic/I18N

I18N
parents 93ee9ec2 f6ef6a49
...@@ -238,7 +238,6 @@ Rectangle { ...@@ -238,7 +238,6 @@ Rectangle {
if(emailField.text === "") { if(emailField.text === "") {
autoUploadCheck.checked = false autoUploadCheck.checked = false
QGroundControl.mavlinkLogManager.enableAutoUpload = false QGroundControl.mavlinkLogManager.enableAutoUpload = false
console.log("forcing enableAutoUpload to false")
} }
} }
} }
...@@ -381,7 +380,7 @@ Rectangle { ...@@ -381,7 +380,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
QGCLabel { QGCLabel {
text: "Uploaded" text: qsTr("Uploaded")
visible: object.uploaded visible: object.uploaded
width: ScreenTools.defaultFontPixelWidth * 20; width: ScreenTools.defaultFontPixelWidth * 20;
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
...@@ -404,7 +403,7 @@ Rectangle { ...@@ -404,7 +403,7 @@ Rectangle {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCButton { QGCButton {
text: "Check All" text: qsTr("Check All")
enabled: !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning enabled: !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
onClicked: { onClicked: {
for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) { for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) {
...@@ -414,7 +413,7 @@ Rectangle { ...@@ -414,7 +413,7 @@ Rectangle {
} }
} }
QGCButton { QGCButton {
text: "Check None" text: qsTr("Check None")
enabled: !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning enabled: !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
onClicked: { onClicked: {
for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) { for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) {
...@@ -424,7 +423,7 @@ Rectangle { ...@@ -424,7 +423,7 @@ Rectangle {
} }
} }
QGCButton { QGCButton {
text: "Delete Selected" text: qsTr("Delete Selected")
enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
onClicked: deleteDialog.open() onClicked: deleteDialog.open()
MessageDialog { MessageDialog {
...@@ -440,7 +439,7 @@ Rectangle { ...@@ -440,7 +439,7 @@ Rectangle {
} }
} }
QGCButton { QGCButton {
text: "Upload Selected" text: qsTr("Upload Selected")
enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning && !_uploadedSelected enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning && !_uploadedSelected
visible: !QGroundControl.mavlinkLogManager.uploading visible: !QGroundControl.mavlinkLogManager.uploading
onClicked: { onClicked: {
...@@ -463,7 +462,7 @@ Rectangle { ...@@ -463,7 +462,7 @@ Rectangle {
} }
} }
QGCButton { QGCButton {
text: "Cancel" text: qsTr("Cancel")
enabled: QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning enabled: QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
visible: QGroundControl.mavlinkLogManager.uploading visible: QGroundControl.mavlinkLogManager.uploading
onClicked: cancelDialog.open() onClicked: cancelDialog.open()
......
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