Merge branch 'master' into master

1 files changed, 40 insertions, 1 deletions

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index de5c74cf..4211f986 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1441,6 +1441,21 @@
     "cliReboot": {
         "message": "CLI reboot detected"
     },
+    "cliSaveToFileBtn": {
+        "message": "Save to File"
+    },
+    "cliSaveToFileFailed": {
+        "message": "Failed to save CLI output to file"
+    },
+    "cliSaveToFileAborted": {
+        "message": "Saving CLI output to file was aborted"
+    },
+    "cliSaveToFileCompleted": {
+        "message": "CLI output successfully saved to file"
+    },
+    "cliClearOutputHistoryBtn": {
+        "message": "Clear output history"
+    },
 
     "loggingNote": {
         "message": "Data will be logged in this tab <span style=\"color: red\">only</span>, leaving the tab will <span style=\"color: red\">cancel</span> logging and application will return to its normal <strong>\"configurator\"</strong> state.<br /> You are free to select the global update period, data will be written into the log file every <strong>1</strong> second for performance reasons."
@@ -2605,6 +2620,12 @@
     "osdElement_MC_POS_XYZ_P_OUTPUTS": {
         "message": "MC Position XYZ P controllers outputs"
     },
+    "osdElement_TEMPERATURE": {
+        "message": "Temperature"
+    },
+    "osdElement_TEMPERATURE_HELP": {
+        "message": "Temperature of the FC, obtained from the most accurate available source."
+    },
     "osdSettingMainVoltageDecimals": {
         "message": "Main Voltage Decimals"
     },
@@ -2823,5 +2844,23 @@
     },
     "proxyLayer": {
         "message": "MapProxy Layer"
-    }    
+    },
+    "accNotchHz": {
+        "message": "Acc. notch filter freq."
+    },
+    "accNotchHzHelp": {
+        "message": "Allow to set a single notch filter for accelerometer readout. Should be configured in the same way as gyro notch if accelerometer records a noise spike above acc. LPF filter"
+    },
+    "accNotchCutoff": {
+        "message": "Acc. notch filter cutoff freq."
+    },
+    "accNotchCutoffHelp": {
+        "message": "Should be kept below acc. notch filter frequency"
+    },
+    "gyroStage2LpfCutoffFrequency": {
+        "message": "Gyro Stage 2 LPF cutoff frequency"
+    },
+    "gyroStage2LpfCutoffFrequencyHelp": {
+        "message": "Second stage gyro low pass filter that is an equivalent of Betaflight not-Kalman stage2 filter. It has to be setup above first stage gyro LPF. For 5 and 6-inch miniquads, this usually means above 150Hz. 7-inch quads above 125Hz."
+    }
 }