diff --git a/ground/gcs/src/plugins/config/airframe.ui b/ground/gcs/src/plugins/config/airframe.ui index 8f4449393..a3827553d 100644 --- a/ground/gcs/src/plugins/config/airframe.ui +++ b/ground/gcs/src/plugins/config/airframe.ui @@ -251,7 +251,7 @@ true - button:help + button:help @@ -264,7 +264,7 @@ Apply - button:apply + button:apply @@ -277,7 +277,7 @@ Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/autotune.ui b/ground/gcs/src/plugins/config/autotune.ui index e890b48ee..70205576b 100644 --- a/ground/gcs/src/plugins/config/autotune.ui +++ b/ground/gcs/src/plugins/config/autotune.ui @@ -688,7 +688,7 @@ will alter settings for the next autotuning flight - button:help + button:help @@ -712,7 +712,7 @@ Useful if you have accidentally changed some settings. - button:reload + button:reload buttongroup:10 @@ -737,7 +737,7 @@ Useful if you have accidentally changed some settings. - button:apply + button:apply @@ -761,7 +761,7 @@ Useful if you have accidentally changed some settings. - button:save + button:save diff --git a/ground/gcs/src/plugins/config/camerastabilization.ui b/ground/gcs/src/plugins/config/camerastabilization.ui index 91e5746de..20c4f2e9d 100644 --- a/ground/gcs/src/plugins/config/camerastabilization.ui +++ b/ground/gcs/src/plugins/config/camerastabilization.ui @@ -1363,7 +1363,7 @@ The same value is used for all axes. - button:help + button:help @@ -1393,7 +1393,7 @@ Apply or Save button afterwards. - button:default + button:default buttongroup:1 @@ -1426,7 +1426,7 @@ Apply or Save button afterwards. - button:reload + button:reload buttongroup:1 @@ -1454,7 +1454,7 @@ Apply or Save button afterwards. - button:apply + button:apply @@ -1484,7 +1484,7 @@ Apply or Save button afterwards. - button:save + button:save diff --git a/ground/gcs/src/plugins/config/cc_hw_settings.ui b/ground/gcs/src/plugins/config/cc_hw_settings.ui index 11aeece7d..45ca67b84 100644 --- a/ground/gcs/src/plugins/config/cc_hw_settings.ui +++ b/ground/gcs/src/plugins/config/cc_hw_settings.ui @@ -495,7 +495,7 @@ true - button:help + button:help @@ -600,7 +600,7 @@ Beware of not locking yourself out! false - button:apply + button:apply @@ -632,7 +632,7 @@ Beware of not locking yourself out! Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/ccattitude.ui b/ground/gcs/src/plugins/config/ccattitude.ui index 5365ea837..3644ea55f 100644 --- a/ground/gcs/src/plugins/config/ccattitude.ui +++ b/ground/gcs/src/plugins/config/ccattitude.ui @@ -583,7 +583,7 @@ A setting of 0.00 disables the filter. true - button:help + button:help @@ -599,7 +599,7 @@ A setting of 0.00 disables the filter. Apply - button:apply + button:apply @@ -618,7 +618,7 @@ A setting of 0.00 disables the filter. Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/configrevohwwidget.ui b/ground/gcs/src/plugins/config/configrevohwwidget.ui index 1f5f0d4a6..3ab3da94c 100644 --- a/ground/gcs/src/plugins/config/configrevohwwidget.ui +++ b/ground/gcs/src/plugins/config/configrevohwwidget.ui @@ -778,7 +778,7 @@ true - button:help + button:help @@ -883,7 +883,7 @@ Beware of not locking yourself out! false - button:apply + button:apply @@ -915,7 +915,7 @@ Beware of not locking yourself out! Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/configrevonanohwwidget.ui b/ground/gcs/src/plugins/config/configrevonanohwwidget.ui index b62adeac9..905396883 100644 --- a/ground/gcs/src/plugins/config/configrevonanohwwidget.ui +++ b/ground/gcs/src/plugins/config/configrevonanohwwidget.ui @@ -498,7 +498,7 @@ true - button:help + button:help @@ -603,7 +603,7 @@ Beware of not locking yourself out! false - button:apply + button:apply @@ -635,7 +635,7 @@ Beware of not locking yourself out! Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/configsparky2hwwidget.ui b/ground/gcs/src/plugins/config/configsparky2hwwidget.ui index 538fb36d4..97d32924b 100644 --- a/ground/gcs/src/plugins/config/configsparky2hwwidget.ui +++ b/ground/gcs/src/plugins/config/configsparky2hwwidget.ui @@ -594,7 +594,7 @@ true - button:help + button:help @@ -699,7 +699,7 @@ Beware of not locking yourself out! false - button:apply + button:apply @@ -731,7 +731,7 @@ Beware of not locking yourself out! Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/defaultconfig.ui b/ground/gcs/src/plugins/config/defaultconfig.ui index 979b8bc72..5ce839fac 100644 --- a/ground/gcs/src/plugins/config/defaultconfig.ui +++ b/ground/gcs/src/plugins/config/defaultconfig.ui @@ -21,7 +21,7 @@ - <place holder - do not translate> + <place holder - do not translate> diff --git a/ground/gcs/src/plugins/config/input.ui b/ground/gcs/src/plugins/config/input.ui index 04f3faed3..203319fcd 100644 --- a/ground/gcs/src/plugins/config/input.ui +++ b/ground/gcs/src/plugins/config/input.ui @@ -2403,7 +2403,7 @@ font:bold; objname:ManualControlSettings - button:default + button:default buttongroup:555 @@ -2794,7 +2794,7 @@ Set to 0 to disable (recommended for soaring fixed wings). true - button:help + button:help @@ -2823,7 +2823,7 @@ Be sure to set the Neutral position on all sliders before sending! Apply - button:apply + button:apply @@ -2852,7 +2852,7 @@ Applies and Saves all settings to SD Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/oplink.ui b/ground/gcs/src/plugins/config/oplink.ui index f1f2329fc..8f784d603 100644 --- a/ground/gcs/src/plugins/config/oplink.ui +++ b/ground/gcs/src/plugins/config/oplink.ui @@ -49,8 +49,8 @@ 0 0 - 949 - 566 + 947 + 575 @@ -1911,7 +1911,7 @@ Leave blank to use autogenerated Device ID. - button:help + button:help @@ -1922,10 +1922,10 @@ Leave blank to use autogenerated Device ID. Send settings to the board but do not save to the non-volatile memory. - Apply + Apply - button:apply + button:apply @@ -1941,7 +1941,7 @@ Leave blank to use autogenerated Device ID. false - button:save + button:save diff --git a/ground/gcs/src/plugins/config/output.ui b/ground/gcs/src/plugins/config/output.ui index d99402496..d806189bd 100644 --- a/ground/gcs/src/plugins/config/output.ui +++ b/ground/gcs/src/plugins/config/output.ui @@ -1008,7 +1008,7 @@ true - button:help + button:help @@ -1037,7 +1037,7 @@ Be sure to set the Neutral position on all sliders before sending! Apply - button:apply + button:apply @@ -1066,7 +1066,7 @@ Applies and Saves all settings to SD Save - button:save + button:save diff --git a/ground/gcs/src/plugins/config/revosensors.ui b/ground/gcs/src/plugins/config/revosensors.ui index 479798395..a5e680a90 100644 --- a/ground/gcs/src/plugins/config/revosensors.ui +++ b/ground/gcs/src/plugins/config/revosensors.ui @@ -1809,7 +1809,7 @@ p, li { white-space: pre-wrap; } true - button:help + button:help @@ -1825,7 +1825,7 @@ specific calibration button on top of the screen. Apply - button:apply + button:apply @@ -1841,7 +1841,7 @@ specific calibration button on top of the screen. false - button:save + button:save diff --git a/ground/gcs/src/plugins/config/stabilization.ui b/ground/gcs/src/plugins/config/stabilization.ui index 34492e626..2c491abea 100644 --- a/ground/gcs/src/plugins/config/stabilization.ui +++ b/ground/gcs/src/plugins/config/stabilization.ui @@ -696,7 +696,7 @@ margin-top: -1px; objname:StabilizationSettings - button:default + button:default buttongroup:66 @@ -764,7 +764,7 @@ margin-top: -1px; objname:StabilizationSettings - button:default + button:default buttongroup:6 @@ -2849,7 +2849,7 @@ border-radius: 5; - button:default + button:default buttongroup:77 @@ -3266,7 +3266,7 @@ border-radius: 5; - button:default + button:default buttongroup:1 @@ -5961,7 +5961,7 @@ Then lower the value by 5 or so. - button:default + button:default buttongroup:2 @@ -8072,7 +8072,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:6 @@ -12417,7 +12417,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:99 @@ -12534,7 +12534,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:4 @@ -15248,7 +15248,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:5 @@ -17104,7 +17104,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:55 @@ -17145,7 +17145,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:56 @@ -17399,7 +17399,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:25 @@ -18666,7 +18666,7 @@ font:bold; objname:StabilizationSettings - button:default + button:default buttongroup:31 @@ -19937,7 +19937,7 @@ font:bold; objname:StabilizationSettings - button:default + button:default buttongroup:15 @@ -20780,7 +20780,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:16 @@ -20844,7 +20844,7 @@ border-radius: 5; objname:StabilizationSettings - button:default + button:default buttongroup:8 @@ -23282,7 +23282,7 @@ font:bold; objname:AltitudeHoldSettings - button:default + button:default buttongroup:98 @@ -24899,7 +24899,7 @@ border-radius: 5; objname:AltitudeHoldSettings - button:default + button:default buttongroup:99 @@ -26257,7 +26257,7 @@ border-radius: 5; - button:help + button:help @@ -26300,7 +26300,7 @@ Useful if you have accidentally changed some settings. - button:reload + button:reload buttongroup:10 @@ -26337,7 +26337,7 @@ Useful if you have accidentally changed some settings. - button:apply + button:apply @@ -26373,7 +26373,7 @@ Useful if you have accidentally changed some settings. - button:save + button:save diff --git a/ground/gcs/src/plugins/config/txpid.ui b/ground/gcs/src/plugins/config/txpid.ui index b0cd6cba2..171345eef 100644 --- a/ground/gcs/src/plugins/config/txpid.ui +++ b/ground/gcs/src/plugins/config/txpid.ui @@ -814,7 +814,7 @@ font:bold; - button:default + button:default buttongroup:10 @@ -1243,7 +1243,7 @@ font:bold; - button:default + button:default buttongroup:11 @@ -1478,7 +1478,7 @@ font:bold; - button:help + button:help @@ -1501,7 +1501,7 @@ font:bold; Apply - button:apply + button:apply @@ -1526,7 +1526,7 @@ font:bold; false - button:save + button:save diff --git a/ground/gcs/src/plugins/logging/loggingplugin.cpp b/ground/gcs/src/plugins/logging/loggingplugin.cpp index e6238b87f..da3efbe9b 100644 --- a/ground/gcs/src/plugins/logging/loggingplugin.cpp +++ b/ground/gcs/src/plugins/logging/loggingplugin.cpp @@ -237,7 +237,7 @@ void LoggingThread::retrieveSettings() } } // Start retrieving - qDebug() << tr("Logging: retrieve settings objects from the autopilot (%1 objects)") + qDebug() << QString("Logging: retrieve settings objects from the autopilot (%1 objects)") .arg(queue.length()); retrieveNextObject(); }