Skip to content

Commit

Permalink
Merge branch 'master' into hideNonFlightmode
Browse files Browse the repository at this point in the history
  • Loading branch information
HThuren authored Dec 11, 2023
2 parents 320ea2d + d79bf9e commit e54916f
Show file tree
Hide file tree
Showing 38 changed files with 527 additions and 245 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ jobs:
with:
node-version-file: '.nvmrc'

- name: Install macos dependencies
run: |
sudo -H pip install setuptools packaging
sudo npm install -g [email protected] node-gyp@10 macos-alias
yarn --network-timeout 1000000
if: ${{ matrix.name == 'macOs' }}

- name: Install Java JDK 8
uses: actions/setup-java@v3
if: ${{ matrix.name == 'Android' }}
Expand Down
54 changes: 43 additions & 11 deletions locales/ca/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -741,10 +741,6 @@
"initialSetupButtonResetZaxisValue": {
"message": "Restableix l'eix Z, offset: $1 graus"
},
"initialSetupHeading": {
"message": "Títol:",
"description": "Heading shown on Setup tab"
},
"initialSetupMixerHead": {
"message": "Tipus de Mixer"
},
Expand Down Expand Up @@ -791,9 +787,16 @@
"message": "Informació del sistema"
},
"initialSetupInfoHeadHelp": {
"message": "Mostra les banderes FC per al desarmament, la informació de la bateria, el nivell RSSI i el maquinari dels sensors",
"message": "Mostra les banderes FC per al desarmament, la informació de la bateria, el nivell RSSI.",
"description": "Message that pops up to describe the System info section"
},
"initialSensorInfoHead": {
"message": "Informació de sensors"
},
"initialSensorInfoHeadHelp": {
"message": "Mostra el maquinari dels sensors",
"description": "Message that pops up to describe the Sensor info section"
},
"initialSetupBattery": {
"message": "Voltatge de bateria:"
},
Expand All @@ -818,11 +821,40 @@
"initialSetupRSSI": {
"message": "RSSI:"
},
"initialSetupNotInBuild": {
"message": "No inclòs a la compil-lació",
"description": "Message that pops up when hardware support not are supported in Build"
},
"initialSetupNotDetected": {
"message": "No detectat",
"description": "Message that pops up when hardware are not detected"
},
"initialSetupRSSIValue": {
"message": "$1 dBm"
},
"initialSetupSensorHardware": {
"message": "Sensors:"
},
"initialSetupRSSIValue": {
"message": "$1 %"
"initialSetupSensorGyro": {
"message": "Gyro:"
},
"initialSetupSensorAcc": {
"message": "Accel:"
},
"initialSetupSensorMag": {
"message": "Mag:"
},
"initialSetupSensorBaro": {
"message": "Baro:"
},
"initialSetupSensorGPS": {
"message": "GPS:"
},
"initialSetupSensorSonar": {
"message": "Sonar:"
},
"initialSetupSensorRadar": {
"message": "Radar:"
},
"initialSetupArmingDisableFlags": {
"message": "Flags deshabilitant l'armat:"
Expand Down Expand Up @@ -2706,10 +2738,6 @@
"message": "Latitud/Longitud actuals:",
"description": "Show GPS position - Latitude / Longitude"
},
"gpsHeading": {
"message": "Encapçalament Mag / GPS:",
"description": "Show GPS heading - Magnetic / GPS course over ground"
},
"gpsSpeed": {
"message": "Velocitat:"
},
Expand Down Expand Up @@ -6158,6 +6186,10 @@
"message": "Altitud",
"description": "Text of the altitude alarm"
},
"osdTimerAlarmOptionLinkQuality": {
"message": "Qualitat enllaç",
"description": "Text of the link quality alarm"
},
"osdWarningTextArmingDisabled": {
"message": "Armant des-habilitat",
"description": "One of the warnings that can be selected to be shown in the OSD"
Expand Down
60 changes: 46 additions & 14 deletions locales/da/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -733,10 +733,6 @@
"initialSetupButtonResetZaxisValue": {
"message": "Nulstil Z-akse, forskydn.: $1 gr"
},
"initialSetupHeading": {
"message": "Kurs:",
"description": "Heading shown on Setup tab"
},
"initialSetupMixerHead": {
"message": "Mixertype"
},
Expand Down Expand Up @@ -783,9 +779,16 @@
"message": "System info"
},
"initialSetupInfoHeadHelp": {
"message": "Viser FC flag som betyder deaktivering. Også batteri information, RSSI niveau og Sensor hardware",
"message": "Viser FC flag som betyder deaktivering. Også batteri information og RSSI niveau",
"description": "Message that pops up to describe the System info section"
},
"initialSensorInfoHead": {
"message": "Sensor enheder"
},
"initialSensorInfoHeadHelp": {
"message": "Viser de sensor enheder som er konfigureret",
"description": "Message that pops up to describe the Sensor info section"
},
"initialSetupBattery": {
"message": "Batteri spænding:"
},
Expand All @@ -810,11 +813,40 @@
"initialSetupRSSI": {
"message": "RSSI:"
},
"initialSetupNotInBuild": {
"message": "Ikke inkluderet i firmware build",
"description": "Message that pops up when hardware support not are supported in Build"
},
"initialSetupNotDetected": {
"message": "Ikke fundet",
"description": "Message that pops up when hardware are not detected"
},
"initialSetupRSSIValue": {
"message": "$1 dBm"
},
"initialSetupSensorHardware": {
"message": "Sensorer:"
},
"initialSetupRSSIValue": {
"message": "$1 %"
"initialSetupSensorGyro": {
"message": "Gyroskop:"
},
"initialSetupSensorAcc": {
"message": "Accel:"
},
"initialSetupSensorMag": {
"message": "Magnetometer / Kompas:"
},
"initialSetupSensorBaro": {
"message": "Barometer:"
},
"initialSetupSensorGPS": {
"message": "GPS:"
},
"initialSetupSensorSonar": {
"message": "Sonar:"
},
"initialSetupSensorRadar": {
"message": "Radar:"
},
"initialSetupArmingDisableFlags": {
"message": "Deaktiverings flag:"
Expand Down Expand Up @@ -2698,10 +2730,6 @@
"message": "Nuværende breddegrad / længdegrad:",
"description": "Show GPS position - Latitude / Longitude"
},
"gpsHeading": {
"message": "Kompas / GPS kurs:",
"description": "Show GPS heading - Magnetic / GPS course over ground"
},
"gpsSpeed": {
"message": "Hastighed:"
},
Expand Down Expand Up @@ -4684,7 +4712,7 @@
"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."
},
"powerBatteryVoltageMeterSource": {
"message": "Kilde for spændingsmåling"
"message": "Sensor ved måling af spænding"
},
"powerBatteryVoltageMeterTypeNone": {
"message": "Ingen"
Expand All @@ -4696,7 +4724,7 @@
"message": "ESC sensor"
},
"powerBatteryCurrentMeterSource": {
"message": "Kilde for strømforbrug måling"
"message": "Sensor ved måling af strømforbrug"
},
"powerBatteryCurrentMeterTypeNone": {
"message": "Ingen"
Expand Down Expand Up @@ -5477,7 +5505,7 @@
"description": "One of the elements of the OSD"
},
"osdDescElementDebug": {
"message": "Logger variabler (for debug)"
"message": "Brugerstyret logning til debug"
},
"osdTextElementPIDRoll": {
"message": "PID krængror",
Expand Down Expand Up @@ -6150,6 +6178,10 @@
"message": "Højde (m el. fod)",
"description": "Text of the altitude alarm"
},
"osdTimerAlarmOptionLinkQuality": {
"message": "Link kvalitet",
"description": "Text of the link quality alarm"
},
"osdWarningTextArmingDisabled": {
"message": "Aktivering slået fra",
"description": "One of the warnings that can be selected to be shown in the OSD"
Expand Down
11 changes: 0 additions & 11 deletions locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,10 +736,6 @@
"initialSetupButtonResetZaxisValue": {
"message": "Z Achse zurücksetzen, Abweichung: $1 Grad"
},
"initialSetupHeading": {
"message": "Richtung:",
"description": "Heading shown on Setup tab"
},
"initialSetupMixerHead": {
"message": "Mixer Typ"
},
Expand Down Expand Up @@ -785,10 +781,6 @@
"initialSetupInfoHead": {
"message": "Systeminfo"
},
"initialSetupInfoHeadHelp": {
"message": "FC-Flags für Disarming, Akku-Information, RSSI-Level und Sensor-Hardware anzeigen",
"description": "Message that pops up to describe the System info section"
},
"initialSetupBattery": {
"message": "Akku Spannung"
},
Expand Down Expand Up @@ -816,9 +808,6 @@
"initialSetupSensorHardware": {
"message": "Sensoren:"
},
"initialSetupRSSIValue": {
"message": "$1 %"
},
"initialSetupArmingDisableFlags": {
"message": "Arming deaktiviert aufgrund:"
},
Expand Down
22 changes: 17 additions & 5 deletions locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -815,8 +815,8 @@
"message": "Reset Z axis, offset: $1 deg"
},
"initialSetupHeading": {
"message": "Heading:",
"description": "Heading shown on Setup tab"
"message": "Yaw:",
"description": "Heading [yaw] attitude value shown on Setup tab"
},
"initialSetupMixerHead": {
"message": "Mixer Type"
Expand Down Expand Up @@ -898,6 +898,14 @@
"initialSetupRSSI": {
"message": "RSSI:"
},
"initialSetupNotInBuild": {
"message": "Not included in build",
"description": "Message that pops up when hardware support not are supported in Build"
},
"initialSetupNotDetected": {
"message": "Not detected",
"description": "Message that pops up when hardware are not detected"
},
"initialSetupRSSIValue": {
"message": "$1 dBm"
},
Expand All @@ -908,7 +916,7 @@
"message": "Gyro:"
},
"initialSetupSensorAcc": {
"message": "Acc:"
"message": "Accel:"
},
"initialSetupSensorMag": {
"message": "Mag:"
Expand Down Expand Up @@ -2816,8 +2824,8 @@
"description": "Show GPS position - Latitude / Longitude"
},
"gpsHeading": {
"message": "Heading Mag / GPS:",
"description": "Show GPS heading - Magnetic / GPS course over ground"
"message": "Heading IMU / GPS:",
"description": "Show IMU / GPS heading - Attitude / GPS course over ground"
},
"gpsSpeed": {
"message": "Speed:"
Expand Down Expand Up @@ -6269,6 +6277,10 @@
"message": "Altitude",
"description": "Text of the altitude alarm"
},
"osdTimerAlarmOptionLinkQuality": {
"message": "Link Quality",
"description": "Text of the link quality alarm"
},
"osdWarningTextArmingDisabled": {
"message": "Arming disabled",
"description": "One of the warnings that can be selected to be shown in the OSD"
Expand Down
Loading

0 comments on commit e54916f

Please sign in to comment.