Skip to content

Commit 3e6c6ab

Browse files
HThurenHThuren
authored
Merge branch 'master' into hideNonFlightmode
2 parents 3dbe0b6 + d79bf9e commit 3e6c6ab

38 files changed

+527
-245
lines changed

‎.github/workflows/ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ jobs:
7878
with:
7979
node-version-file: '.nvmrc'
8080

81+
- name: Install macos dependencies
82+
run: |
83+
sudo -H pip install setuptools packaging
84+
sudo npm install -g [email protected] node-gyp@10 macos-alias
85+
yarn --network-timeout 1000000
86+
if: ${{ matrix.name == 'macOs' }}
87+
8188
- name: Install Java JDK 8
8289
uses: actions/setup-java@v3
8390
if: ${{ matrix.name == 'Android' }}

‎locales/ca/messages.json

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -741,10 +741,6 @@
741741
"initialSetupButtonResetZaxisValue": {
742742
"message": "Restableix l'eix Z, offset: $1 graus"
743743
},
744-
"initialSetupHeading": {
745-
"message": "Títol:",
746-
"description": "Heading shown on Setup tab"
747-
},
748744
"initialSetupMixerHead": {
749745
"message": "Tipus de Mixer"
750746
},
@@ -791,9 +787,16 @@
791787
"message": "Informació del sistema"
792788
},
793789
"initialSetupInfoHeadHelp": {
794-
"message": "Mostra les banderes FC per al desarmament, la informació de la bateria, el nivell RSSI i el maquinari dels sensors",
790+
"message": "Mostra les banderes FC per al desarmament, la informació de la bateria, el nivell RSSI.",
795791
"description": "Message that pops up to describe the System info section"
796792
},
793+
"initialSensorInfoHead": {
794+
"message": "Informació de sensors"
795+
},
796+
"initialSensorInfoHeadHelp": {
797+
"message": "Mostra el maquinari dels sensors",
798+
"description": "Message that pops up to describe the Sensor info section"
799+
},
797800
"initialSetupBattery": {
798801
"message": "Voltatge de bateria:"
799802
},
@@ -818,11 +821,40 @@
818821
"initialSetupRSSI": {
819822
"message": "RSSI:"
820823
},
824+
"initialSetupNotInBuild": {
825+
"message": "No inclòs a la compil-lació",
826+
"description": "Message that pops up when hardware support not are supported in Build"
827+
},
828+
"initialSetupNotDetected": {
829+
"message": "No detectat",
830+
"description": "Message that pops up when hardware are not detected"
831+
},
832+
"initialSetupRSSIValue": {
833+
"message": "$1 dBm"
834+
},
821835
"initialSetupSensorHardware": {
822836
"message": "Sensors:"
823837
},
824-
"initialSetupRSSIValue": {
825-
"message": "$1 %"
838+
"initialSetupSensorGyro": {
839+
"message": "Gyro:"
840+
},
841+
"initialSetupSensorAcc": {
842+
"message": "Accel:"
843+
},
844+
"initialSetupSensorMag": {
845+
"message": "Mag:"
846+
},
847+
"initialSetupSensorBaro": {
848+
"message": "Baro:"
849+
},
850+
"initialSetupSensorGPS": {
851+
"message": "GPS:"
852+
},
853+
"initialSetupSensorSonar": {
854+
"message": "Sonar:"
855+
},
856+
"initialSetupSensorRadar": {
857+
"message": "Radar:"
826858
},
827859
"initialSetupArmingDisableFlags": {
828860
"message": "Flags deshabilitant l'armat:"
@@ -2706,10 +2738,6 @@
27062738
"message": "Latitud/Longitud actuals:",
27072739
"description": "Show GPS position - Latitude / Longitude"
27082740
},
2709-
"gpsHeading": {
2710-
"message": "Encapçalament Mag / GPS:",
2711-
"description": "Show GPS heading - Magnetic / GPS course over ground"
2712-
},
27132741
"gpsSpeed": {
27142742
"message": "Velocitat:"
27152743
},
@@ -6158,6 +6186,10 @@
61586186
"message": "Altitud",
61596187
"description": "Text of the altitude alarm"
61606188
},
6189+
"osdTimerAlarmOptionLinkQuality": {
6190+
"message": "Qualitat enllaç",
6191+
"description": "Text of the link quality alarm"
6192+
},
61616193
"osdWarningTextArmingDisabled": {
61626194
"message": "Armant des-habilitat",
61636195
"description": "One of the warnings that can be selected to be shown in the OSD"

‎locales/da/messages.json

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -733,10 +733,6 @@
733733
"initialSetupButtonResetZaxisValue": {
734734
"message": "Nulstil Z-akse, forskydn.: $1 gr"
735735
},
736-
"initialSetupHeading": {
737-
"message": "Kurs:",
738-
"description": "Heading shown on Setup tab"
739-
},
740736
"initialSetupMixerHead": {
741737
"message": "Mixertype"
742738
},
@@ -783,9 +779,16 @@
783779
"message": "System info"
784780
},
785781
"initialSetupInfoHeadHelp": {
786-
"message": "Viser FC flag som betyder deaktivering. Også batteri information, RSSI niveau og Sensor hardware",
782+
"message": "Viser FC flag som betyder deaktivering. Også batteri information og RSSI niveau",
787783
"description": "Message that pops up to describe the System info section"
788784
},
785+
"initialSensorInfoHead": {
786+
"message": "Sensor enheder"
787+
},
788+
"initialSensorInfoHeadHelp": {
789+
"message": "Viser de sensor enheder som er konfigureret",
790+
"description": "Message that pops up to describe the Sensor info section"
791+
},
789792
"initialSetupBattery": {
790793
"message": "Batteri spænding:"
791794
},
@@ -810,11 +813,40 @@
810813
"initialSetupRSSI": {
811814
"message": "RSSI:"
812815
},
816+
"initialSetupNotInBuild": {
817+
"message": "Ikke inkluderet i firmware build",
818+
"description": "Message that pops up when hardware support not are supported in Build"
819+
},
820+
"initialSetupNotDetected": {
821+
"message": "Ikke fundet",
822+
"description": "Message that pops up when hardware are not detected"
823+
},
824+
"initialSetupRSSIValue": {
825+
"message": "$1 dBm"
826+
},
813827
"initialSetupSensorHardware": {
814828
"message": "Sensorer:"
815829
},
816-
"initialSetupRSSIValue": {
817-
"message": "$1 %"
830+
"initialSetupSensorGyro": {
831+
"message": "Gyroskop:"
832+
},
833+
"initialSetupSensorAcc": {
834+
"message": "Accel:"
835+
},
836+
"initialSetupSensorMag": {
837+
"message": "Magnetometer / Kompas:"
838+
},
839+
"initialSetupSensorBaro": {
840+
"message": "Barometer:"
841+
},
842+
"initialSetupSensorGPS": {
843+
"message": "GPS:"
844+
},
845+
"initialSetupSensorSonar": {
846+
"message": "Sonar:"
847+
},
848+
"initialSetupSensorRadar": {
849+
"message": "Radar:"
818850
},
819851
"initialSetupArmingDisableFlags": {
820852
"message": "Deaktiverings flag:"
@@ -2698,10 +2730,6 @@
26982730
"message": "Nuværende breddegrad / længdegrad:",
26992731
"description": "Show GPS position - Latitude / Longitude"
27002732
},
2701-
"gpsHeading": {
2702-
"message": "Kompas / GPS kurs:",
2703-
"description": "Show GPS heading - Magnetic / GPS course over ground"
2704-
},
27052733
"gpsSpeed": {
27062734
"message": "Hastighed:"
27072735
},
@@ -4684,7 +4712,7 @@
46844712
"message": "Firmware opgradering <span class=\"message-negative\">kræves</span>. Batteri/Amperage/Spænding konfigurationer ved hjælp af API &lt; 1.33.0 (Betaflight release &lt;= 3.17) understøttes ikke."
46854713
},
46864714
"powerBatteryVoltageMeterSource": {
4687-
"message": "Kilde for spændingsmåling"
4715+
"message": "Sensor ved måling af spænding"
46884716
},
46894717
"powerBatteryVoltageMeterTypeNone": {
46904718
"message": "Ingen"
@@ -4696,7 +4724,7 @@
46964724
"message": "ESC sensor"
46974725
},
46984726
"powerBatteryCurrentMeterSource": {
4699-
"message": "Kilde for strømforbrug måling"
4727+
"message": "Sensor ved måling af strømforbrug"
47004728
},
47014729
"powerBatteryCurrentMeterTypeNone": {
47024730
"message": "Ingen"
@@ -5477,7 +5505,7 @@
54775505
"description": "One of the elements of the OSD"
54785506
},
54795507
"osdDescElementDebug": {
5480-
"message": "Logger variabler (for debug)"
5508+
"message": "Brugerstyret logning til debug"
54815509
},
54825510
"osdTextElementPIDRoll": {
54835511
"message": "PID krængror",
@@ -6150,6 +6178,10 @@
61506178
"message": "Højde (m el. fod)",
61516179
"description": "Text of the altitude alarm"
61526180
},
6181+
"osdTimerAlarmOptionLinkQuality": {
6182+
"message": "Link kvalitet",
6183+
"description": "Text of the link quality alarm"
6184+
},
61536185
"osdWarningTextArmingDisabled": {
61546186
"message": "Aktivering slået fra",
61556187
"description": "One of the warnings that can be selected to be shown in the OSD"

‎locales/de/messages.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -736,10 +736,6 @@
736736
"initialSetupButtonResetZaxisValue": {
737737
"message": "Z Achse zurücksetzen, Abweichung: $1 Grad"
738738
},
739-
"initialSetupHeading": {
740-
"message": "Richtung:",
741-
"description": "Heading shown on Setup tab"
742-
},
743739
"initialSetupMixerHead": {
744740
"message": "Mixer Typ"
745741
},
@@ -785,10 +781,6 @@
785781
"initialSetupInfoHead": {
786782
"message": "Systeminfo"
787783
},
788-
"initialSetupInfoHeadHelp": {
789-
"message": "FC-Flags für Disarming, Akku-Information, RSSI-Level und Sensor-Hardware anzeigen",
790-
"description": "Message that pops up to describe the System info section"
791-
},
792784
"initialSetupBattery": {
793785
"message": "Akku Spannung"
794786
},
@@ -816,9 +808,6 @@
816808
"initialSetupSensorHardware": {
817809
"message": "Sensoren:"
818810
},
819-
"initialSetupRSSIValue": {
820-
"message": "$1 %"
821-
},
822811
"initialSetupArmingDisableFlags": {
823812
"message": "Arming deaktiviert aufgrund:"
824813
},

‎locales/en/messages.json

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,8 @@
815815
"message": "Reset Z axis, offset: $1 deg"
816816
},
817817
"initialSetupHeading": {
818-
"message": "Heading:",
819-
"description": "Heading shown on Setup tab"
818+
"message": "Yaw:",
819+
"description": "Heading [yaw] attitude value shown on Setup tab"
820820
},
821821
"initialSetupMixerHead": {
822822
"message": "Mixer Type"
@@ -898,6 +898,14 @@
898898
"initialSetupRSSI": {
899899
"message": "RSSI:"
900900
},
901+
"initialSetupNotInBuild": {
902+
"message": "Not included in build",
903+
"description": "Message that pops up when hardware support not are supported in Build"
904+
},
905+
"initialSetupNotDetected": {
906+
"message": "Not detected",
907+
"description": "Message that pops up when hardware are not detected"
908+
},
901909
"initialSetupRSSIValue": {
902910
"message": "$1 dBm"
903911
},
@@ -908,7 +916,7 @@
908916
"message": "Gyro:"
909917
},
910918
"initialSetupSensorAcc": {
911-
"message": "Acc:"
919+
"message": "Accel:"
912920
},
913921
"initialSetupSensorMag": {
914922
"message": "Mag:"
@@ -2816,8 +2824,8 @@
28162824
"description": "Show GPS position - Latitude / Longitude"
28172825
},
28182826
"gpsHeading": {
2819-
"message": "Heading Mag / GPS:",
2820-
"description": "Show GPS heading - Magnetic / GPS course over ground"
2827+
"message": "Heading IMU / GPS:",
2828+
"description": "Show IMU / GPS heading - Attitude / GPS course over ground"
28212829
},
28222830
"gpsSpeed": {
28232831
"message": "Speed:"
@@ -6269,6 +6277,10 @@
62696277
"message": "Altitude",
62706278
"description": "Text of the altitude alarm"
62716279
},
6280+
"osdTimerAlarmOptionLinkQuality": {
6281+
"message": "Link Quality",
6282+
"description": "Text of the link quality alarm"
6283+
},
62726284
"osdWarningTextArmingDisabled": {
62736285
"message": "Arming disabled",
62746286
"description": "One of the warnings that can be selected to be shown in the OSD"

0 commit comments

Comments
 (0)