diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 862df89ff..c65ba70a0 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -90,7 +90,7 @@ body: - iFlight Commando8 - Fatfish F16 - Flysky EL18 - - Flysky NB4+ + - Flysky NB4+ - Flysky NV14 - Flysky PA01 - Flysky PL18/PL18EV @@ -106,13 +106,13 @@ body: - FrSky X10 Express / X10S Express (ACCESS) - FrSky X12 - FrSky X-Lite / S / Pro - - HelloRadioSky V12 + - HelloRadioSky V12 - HelloRadioSky V14 - HelloRadioSky V16 - Jumper T12 - Jumper T14 - Jumper T15 - - Jumper T15Pro + - Jumper T15 Pro - Jumper T16 - Jumper T18 - Jumper T20/T20S @@ -128,7 +128,7 @@ body: - RadioMaster TX12 / TX12MK2 - RadioMaster TX15 - RadioMaster TX16S / TX16SMK2 - - RadioMaster TX16SMK3 + - RadioMaster TX16 SMK3 - RadioMaster Zorro - Other (Please specify below) validations: diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp index 8ba619ee0..4bcecbff8 100644 --- a/companion/src/firmwares/boards.cpp +++ b/companion/src/firmwares/boards.cpp @@ -526,7 +526,7 @@ QString Boards::getBoardName(Board::Type board) case BOARD_JUMPER_T15: return "Jumper T15"; case BOARD_JUMPER_T15PRO: - return "Jumper T15Pro"; + return "Jumper T15 Pro"; case BOARD_JUMPER_T16: return "Jumper T16"; case BOARD_JUMPER_T18: @@ -550,7 +550,7 @@ QString Boards::getBoardName(Board::Type board) case BOARD_RADIOMASTER_TX16S: return "Radiomaster TX16S"; case BOARD_RADIOMASTER_TX16SMK3: - return "Radiomaster TX16SMK3"; + return "Radiomaster TX16 SMK3"; case BOARD_RADIOMASTER_TX15: return "Radiomaster TX15"; case BOARD_RADIOMASTER_ZORRO: diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index e2ca6cadb..776abbf70 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -736,8 +736,8 @@ void registerOpenTxFirmwares() addOpenTxRfOptions(firmware, FLEX); registerOpenTxFirmware(firmware); - /* Jumper T15Pro board */ - firmware = new OpenTxFirmware(FIRMWAREID("t15pro"), Firmware::tr("Jumper T15Pro"), BOARD_JUMPER_T15PRO); + /* Jumper T15 Pro board */ + firmware = new OpenTxFirmware(FIRMWAREID("t15pro"), Firmware::tr("Jumper T15 Pro"), BOARD_JUMPER_T15PRO); addOpenTxFrskyOptions(firmware); addOpenTxRfOptions(firmware, FLEX); registerOpenTxFirmware(firmware); diff --git a/companion/src/translations/companion_cs.ts b/companion/src/translations/companion_cs.ts index 75be7302b..65cce473e 100644 --- a/companion/src/translations/companion_cs.ts +++ b/companion/src/translations/companion_cs.ts @@ -3751,7 +3751,7 @@ FAI je soutěžní mód (www.fai.org), zablokuje vario, zobrazení telemetrie a - Jumper T15Pro + Jumper T15 Pro @@ -4238,13 +4238,13 @@ FAI je soutěžní mód (www.fai.org), zablokuje vario, zobrazení telemetrie a - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_da.ts b/companion/src/translations/companion_da.ts index 605044851..7af732478 100644 --- a/companion/src/translations/companion_da.ts +++ b/companion/src/translations/companion_da.ts @@ -3694,7 +3694,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4246,13 +4246,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' @@ -6336,7 +6336,7 @@ Værdier mellem 5 og 12 volt accepteres If you enable FAI, only RSSI and RxBt sensors will keep working. This function cannot be disabled by the radio. Are you sure ? - Aktiverer du FAI, vil kun RSSI og RxBt sensorerne virke. + Aktiverer du FAI, vil kun RSSI og RxBt sensorerne virke. Det kan ikke deaktiveres af senderen. Er du sikker? @@ -7431,7 +7431,7 @@ Er du sikker? The column containing GPS coordinates must be named "GPS". The columns for altitude "GAlt" and for speed "GSpd" are optional - Kollone til GPS-koordinater skal kaldes "GPS". + Kollone til GPS-koordinater skal kaldes "GPS". Kolumnerna for højde (GAlt) og hastighed (GSpd) er valgfrie @@ -17886,7 +17886,7 @@ Do you wish to continue? Advarsel: Radio indstillings fil mangler i Board sektion! Aktuelt firmware profil Board anvendes. - + Vil du fortsætte? diff --git a/companion/src/translations/companion_de.ts b/companion/src/translations/companion_de.ts index 322548c67..2157c6fa3 100644 --- a/companion/src/translations/companion_de.ts +++ b/companion/src/translations/companion_de.ts @@ -3752,7 +3752,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4239,13 +4239,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_en.ts b/companion/src/translations/companion_en.ts index f698c8f7f..0c7bbc501 100644 --- a/companion/src/translations/companion_en.ts +++ b/companion/src/translations/companion_en.ts @@ -3725,7 +3725,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4212,13 +4212,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_es.ts b/companion/src/translations/companion_es.ts index 9e4c75d1a..079d74907 100644 --- a/companion/src/translations/companion_es.ts +++ b/companion/src/translations/companion_es.ts @@ -3760,7 +3760,7 @@ Vacío significa incluir todos. Comodines ?, *, y [...] aceptados. - Jumper T15Pro + Jumper T15 Pro @@ -4247,13 +4247,13 @@ Vacío significa incluir todos. Comodines ?, *, y [...] aceptados. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_fi.ts b/companion/src/translations/companion_fi.ts index 85d8bb128..c57bc6edf 100644 --- a/companion/src/translations/companion_fi.ts +++ b/companion/src/translations/companion_fi.ts @@ -3749,7 +3749,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4236,13 +4236,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index 59559f087..aec443fc2 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -3833,7 +3833,7 @@ Blanc signifie "inclure tous".Les métacaractères ?, * et [...] sont - Jumper T15Pro + Jumper T15 Pro @@ -4243,13 +4243,13 @@ Blanc signifie "inclure tous".Les métacaractères ?, * et [...] sont - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_he.ts b/companion/src/translations/companion_he.ts index e134f2821..aba93dda3 100644 --- a/companion/src/translations/companion_he.ts +++ b/companion/src/translations/companion_he.ts @@ -3761,7 +3761,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4212,13 +4212,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_it.ts b/companion/src/translations/companion_it.ts index fd93fe91f..f39dd9b5a 100644 --- a/companion/src/translations/companion_it.ts +++ b/companion/src/translations/companion_it.ts @@ -3749,7 +3749,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4236,13 +4236,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_ja.ts b/companion/src/translations/companion_ja.ts index 3359052b2..db7173aaf 100644 --- a/companion/src/translations/companion_ja.ts +++ b/companion/src/translations/companion_ja.ts @@ -3745,7 +3745,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4232,13 +4232,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_ko.ts b/companion/src/translations/companion_ko.ts index 8a90c5f4a..e9621acce 100644 --- a/companion/src/translations/companion_ko.ts +++ b/companion/src/translations/companion_ko.ts @@ -3766,7 +3766,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4253,13 +4253,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_nl.ts b/companion/src/translations/companion_nl.ts index 1e7e20f44..7cadbf309 100644 --- a/companion/src/translations/companion_nl.ts +++ b/companion/src/translations/companion_nl.ts @@ -3761,7 +3761,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4212,13 +4212,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_pl.ts b/companion/src/translations/companion_pl.ts index aeba3a5cd..0091e93dc 100644 --- a/companion/src/translations/companion_pl.ts +++ b/companion/src/translations/companion_pl.ts @@ -3731,7 +3731,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4218,13 +4218,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' @@ -13396,7 +13396,7 @@ NOTE: any existing EEPROM data incompatible with the selected radio type may be ERROR: Couldn't start simulator, missing radio/profile/data file/folder. Profile ID: [%1]; Radio ID: [%2]; Data File: [%3] - BŁĄD: Nie mogę wystartować symulatora, brakuje radia/profilu/pliku danych/folderu + BŁĄD: Nie mogę wystartować symulatora, brakuje radia/profilu/pliku danych/folderu ID Profilu: [%1]; ID Radia: [%2]; Plik Danych: [%3] diff --git a/companion/src/translations/companion_pt.ts b/companion/src/translations/companion_pt.ts index 3beaca741..5a89fb916 100644 --- a/companion/src/translations/companion_pt.ts +++ b/companion/src/translations/companion_pt.ts @@ -3761,7 +3761,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4212,13 +4212,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_ru.ts b/companion/src/translations/companion_ru.ts index 6331b78c7..4945bf031 100644 --- a/companion/src/translations/companion_ru.ts +++ b/companion/src/translations/companion_ru.ts @@ -3791,7 +3791,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4242,13 +4242,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index 2d07f48d9..9ecb0d2bd 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -3600,7 +3600,7 @@ Tomt betyder inkludera alla. ?, * och [...] jokertecken accepteras. - Jumper T15Pro + Jumper T15 Pro @@ -4253,16 +4253,16 @@ Tomt betyder inkludera alla. ?, * och [...] jokertecken accepteras. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Inkompatibilitet - File '%2' Ansluten radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' - %1 + %1 Inkompatibilitet - File '%2' Profil: '%3' @@ -6349,7 +6349,7 @@ Acceptabla värden är 3 - 12 volt If you enable FAI, only RSSI and RxBt sensors will keep working. This function cannot be disabled by the radio. Are you sure ? - Om du aktiverar FAI kommer endast RSSI och RxBt-sensorerna + Om du aktiverar FAI kommer endast RSSI och RxBt-sensorerna att fungera. Detta går inte att ändra från radion. Är du säker? @@ -7444,7 +7444,7 @@ att fungera. Detta går inte att ändra från radion. The column containing GPS coordinates must be named "GPS". The columns for altitude "GAlt" and for speed "GSpd" are optional - Kolumnen med GPS-koordinater måste heta "GPS". + Kolumnen med GPS-koordinater måste heta "GPS". Kolumnerna för höjd (GAlt) och hastighet (GSpd) är valfria diff --git a/companion/src/translations/companion_zh_CN.ts b/companion/src/translations/companion_zh_CN.ts index d143a9a2b..fa6b4a413 100644 --- a/companion/src/translations/companion_zh_CN.ts +++ b/companion/src/translations/companion_zh_CN.ts @@ -3779,7 +3779,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4267,13 +4267,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' @@ -4807,7 +4807,7 @@ Incompatability - File: '%2' Profile: '%3' General settings used throught the transmitter. These will be relevant for all models in the same EEPROM. - 遥控器一般设定, 用在整个遥控器上 + 遥控器一般设定, 用在整个遥控器上 对相同的EEPROM, 对所有模型这些设置都是相同的. @@ -5879,7 +5879,7 @@ MODE4 模式4: This is the threshold where the battery warning sounds. Acceptable values are 3v..12v - 遥控器电池警告电压 + 遥控器电池警告电压 当电压低于此数值时电量告警响起 允许值是3V - 12V @@ -12877,7 +12877,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Throttle Warning - 油门杆位置告警 + 油门杆位置告警 [Throttle State] diff --git a/companion/src/translations/companion_zh_TW.ts b/companion/src/translations/companion_zh_TW.ts index 11e48cede..0c0f12c8b 100644 --- a/companion/src/translations/companion_zh_TW.ts +++ b/companion/src/translations/companion_zh_TW.ts @@ -3779,7 +3779,7 @@ Blank means include all. ?, *, and [...] wildcards accepted. - Jumper T15Pro + Jumper T15 Pro @@ -4267,13 +4267,13 @@ Blank means include all. ?, *, and [...] wildcards accepted. - %1 + %1 Incompatability - File: '%2' Connected radio: '%3' - %1 + %1 Incompatability - File: '%2' Profile: '%3' @@ -12877,7 +12877,7 @@ If this is checked the throttle will be reversed. Idle will be forward, trim wi Throttle Warning - 油門杆位置警告 + 油門杆位置警告 [Throttle State] diff --git a/fw.json b/fw.json index 3fa0205f8..39805d8c3 100644 --- a/fw.json +++ b/fw.json @@ -26,7 +26,7 @@ ["Jumper T12 MAX", "t12max-"], ["Jumper T14", "t14-"], ["Jumper T15", "t15-"], - ["Jumper T15Pro", "t15pro-"], + ["Jumper T15 Pro", "t15pro-"], ["Jumper T16", "t16-"], ["Jumper T18", "t18-"], ["Jumper T20", "t20-"],