diff --git a/src/config.c b/src/config.c index 4a0556de9..a0ef1c9e7 100644 --- a/src/config.c +++ b/src/config.c @@ -339,6 +339,7 @@ load_machine(void) { .old = "infinia7200", .new = "tc430hx", .new_bios = "infinia7200" }, { .old = "dellvenus", .new = "vs440fx", .new_bios = "dellvenus" }, { .old = "gw2kvenus", .new = "vs440fx", .new_bios = "gw2kvenus" }, + { .old = "lgibmx7g", .new = "ms6119", .new_bios = "lgibmx7g" }, { 0 } }; diff --git a/src/game/joystick_standard.c b/src/game/joystick_standard.c index a1ed501b6..c62611663 100644 --- a/src/game/joystick_standard.c +++ b/src/game/joystick_standard.c @@ -899,7 +899,7 @@ const joystick_t joystick_steering_wheel_4_button = { }; const joystick_t joystick_tm_formula_t1t2 = { - .name = "Thrustmaster Formula T1/T2 with Adaptor", + .name = "Thrustmaster Formula T1/T2 with adapter", .internal_name = "thrustmaster_formula_t1t2", .init = joystick_standard_init, .close = joystick_standard_close, @@ -918,7 +918,7 @@ const joystick_t joystick_tm_formula_t1t2 = { // TODO Validate this const joystick_t joystick_tm_formula_t1t2wa = { - .name = "Thrustmaster Formula T1/T2 without Adaptor", + .name = "Thrustmaster Formula T1/T2 without adapter", .internal_name = "thrustmaster_formula_t1t2wa", .init = joystick_standard_init, .close = joystick_standard_close, diff --git a/src/mem/rom.c b/src/mem/rom.c index 631328913..cee00cb0f 100644 --- a/src/mem/rom.c +++ b/src/mem/rom.c @@ -643,27 +643,27 @@ bios_load(const char *fn1, const char *fn2, uint32_t addr, int sz, int off, int int bios_load_linear_combined(const char *fn1, const char *fn2, int sz, UNUSED(int off)) { - return bios_load_linear(fn1, 0x000f0000, 131072, 128) && \ + return bios_load_linear(fn1, 0x000f0000, 131072, 128) && bios_load_aux_linear(fn2, 0x000e0000, sz - 65536, 128); } int bios_load_linear_combined2(const char *fn1, const char *fn2, const char *fn3, const char *fn4, const char *fn5, int sz, int off) { - return bios_load_linear(fn3, 0x000f0000, 262144, off) && \ - bios_load_aux_linear(fn1, 0x000d0000, 65536, off) && \ - bios_load_aux_linear(fn2, 0x000c0000, 65536, off) && \ - bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off) && \ + return bios_load_linear(fn3, 0x000f0000, 262144, off) && + bios_load_aux_linear(fn1, 0x000d0000, 65536, off) && + bios_load_aux_linear(fn2, 0x000c0000, 65536, off) && + bios_load_aux_linear(fn4, 0x000e0000, sz - 196608, off) && (!fn5 || bios_load_aux_linear(fn5, 0x000ec000, 16384, 0)); } int bios_load_linear_combined2_ex(const char *fn1, const char *fn2, const char *fn3, const char *fn4, const char *fn5, int sz, int off) { - return bios_load_linear(fn3, 0x000e0000, 262144, off) && \ - bios_load_aux_linear(fn1, 0x000c0000, 65536, off) && \ - bios_load_aux_linear(fn2, 0x000d0000, 65536, off) && \ - bios_load_aux_linear(fn4, 0x000f0000, sz - 196608, off) && \ + return bios_load_linear(fn3, 0x000e0000, 262144, off) && + bios_load_aux_linear(fn1, 0x000c0000, 65536, off) && + bios_load_aux_linear(fn2, 0x000d0000, 65536, off) && + bios_load_aux_linear(fn4, 0x000f0000, sz - 196608, off) && (!fn5 || bios_load_aux_linear(fn5, 0x000fc000, 16384, 0)); } diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index 38cd36487..7dd1e5d7a 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -850,10 +850,10 @@ msgid "Invalid PCap device" msgstr "Neplatné PCap zařízení" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Obecný otočný ovladač" msgid "2-axis, 1-button joystick(s)" -msgstr "Joystick s 2 osami a 1 tlačítky" +msgstr "Joystick s 2 osami a 1 tlačítkem" msgid "2-axis, 2-button joystick(s)" msgstr "Joystick s 2 osami a 2 tlačítky" @@ -880,19 +880,19 @@ msgid "3-axis, 4-button joystick" msgstr "Joystick s 3 osami a 4 tlačítky" msgid "4-axis, 2-button joystick" -msgstr "Joystick s 4 osami a 2 tlačítky" +msgstr "Joystick se 4 osami a 2 tlačítky" msgid "4-axis, 3-button joystick" -msgstr "Joystick s 4 osami a 3 tlačítky" +msgstr "Joystick se 4 osami a 3 tlačítky" msgid "4-axis, 4-button joystick" -msgstr "Joystick s 4 osami a 4 tlačítky" +msgstr "Joystick se 4 osami a 4 tlačítky" msgid "2-button gamepad(s)" -msgstr "Ovladač se 2 tlačítky" +msgstr "Ovladač s 2 tlačítky" msgid "3-button gamepad" -msgstr "Ovladač se 3 tlačítky" +msgstr "Ovladač s 3 tlačítky" msgid "4-button gamepad" msgstr "Ovladač se 4 tlačítky" @@ -904,10 +904,10 @@ msgid "Gravis PC GamePad" msgstr "Gravis PC GamePad" msgid "2-button flight yoke" -msgstr "Letecký knipl se 2 tlačítky" +msgstr "Letecký knipl s 2 tlačítky" msgid "3-button flight yoke" -msgstr "Letecký knipl se32 tlačítky" +msgstr "Letecký knipl s 3 tlačítky" msgid "4-button flight yoke" msgstr "Letecký knipl se 4 tlačítky" @@ -919,7 +919,7 @@ msgid "3-button flight yoke with throttle" msgstr "Letecký knipl s 3 tlačítky a pákou" msgid "4-button flight yoke with throttle" -msgstr "Letecký knipl s 4 tlačítky a pákou" +msgstr "Letecký knipl se 4 tlačítky a pákou" msgid "Steering wheel (3-axis, 2-button)" msgstr "Volant (3 osy, 2 tlačítka)" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 s adaptérem" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 bez adaptéru" msgid "None" msgstr "Žadné" @@ -1852,10 +1852,10 @@ msgid "Adapter:" msgstr "Adaptér:" msgid "VDE Socket:" -msgstr "Zásuvka VDE:" +msgstr "VDE socket:" msgid "TAP Bridge Device:" -msgstr "" +msgstr "Zařízení TAP mostu:" msgid "86Box Unit Tester" msgstr "86Box Unit Tester" diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 7463747a7..fef11a6f5 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Ungültiges PCap-Gerät" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Generischer Paddel-Controller(s)" msgid "2-axis, 1-button joystick(s)" msgstr "2-Achsen-, 1-Tasten-Joystick(s)" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 mit Adapter" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 ohne Adapter" msgid "None" msgstr "Ohne" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index 3210dc713..6fc268772 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Dispositivo PCap inválido" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Controlador(es) de paleta genérico(s)" msgid "2-axis, 1-button joystick(s)" msgstr "Mando(s) de 2 ejes, 1 botones" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 con adaptador" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 sin adaptador" msgid "None" msgstr "Ninguno" diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index ba494bb6e..db85cedb5 100644 --- a/src/qt/languages/fi-FI.po +++ b/src/qt/languages/fi-FI.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Virheellinen PCap-laite" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Yleinen melainohjain" msgid "2-axis, 1-button joystick(s)" msgstr "2-akseliset 1-painikkeiset peliohjaimet" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 adapterilla" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 ilman adapteria" msgid "None" msgstr "Ei mikään" diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index f62e55978..90cfcffda 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Dispositif PCap invalide" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Contrôleur(s) à palette générique(s)" msgid "2-axis, 1-button joystick(s)" msgstr "Manette(s) avec 2 axes, 1 boutons" @@ -975,11 +975,11 @@ msgstr "Système de contrôle de vol Thrustmaster" msgid "Thrustmaster FCS + Rudder Control System" msgstr "SCV Thrustmaster + Système de commande de gouvernail" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 avec adaptateur" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 sans adaptateur" msgid "None" msgstr "Aucun" diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index 7f460914a..4b100612f 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Nevažeći PCap uređaj" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Generički kontroleri s lopaticama" msgid "2-axis, 1-button joystick(s)" msgstr "Palica za igru s 2 osi, 1 tipke" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 s adapterom" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 bez adaptera" msgid "None" msgstr "Bez" diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index c8eb2e6e7..fcefaad62 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Dispositivo PCap non valido" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Controller generico/i a paletta" msgid "2-axis, 1-button joystick(s)" msgstr "Joystick a 2 assi, 1 pulsanti" @@ -975,11 +975,11 @@ msgstr "Sistema di controllo Thrustmaster Flight" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Sistema di controllo timone" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 con adattatore" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 senza adattatore" msgid "None" msgstr "Nessuno" diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index 8cc00a146..169e4e220 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "不正なPCapデバイス" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "汎用パドルコントローラー" msgid "2-axis, 1-button joystick(s)" msgstr "ジョイスティック(2軸、1ボタン)" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "アダプター付き Thrustmaster Formula T1/T2" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "アダプターなし Thrustmaster Formula T1/T2" msgid "None" msgstr "なし" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index 4c15c0cb0..9747390c6 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "PCap 장치가 올바르지 않습니다" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "일반 패들 컨트롤러" msgid "2-axis, 1-button joystick(s)" msgstr "2축, 1버튼 조이스틱" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "어댑터 포함 Thrustmaster Formula T1/T2" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "어댑터 미포함 Thrustmaster Formula T1/T2" msgid "None" msgstr "없음" diff --git a/src/qt/languages/nb-NO.po b/src/qt/languages/nb-NO.po index b4c7cd57c..4cb843dd3 100644 --- a/src/qt/languages/nb-NO.po +++ b/src/qt/languages/nb-NO.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Ugyldig PCap-enhet" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Generisk padle-kontroller(e)" msgid "2-axis, 1-button joystick(s)" msgstr "2-akset, 1-knapps styrespak(er)" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Ror-kontrollsystem" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 med adapter" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 uten adapter" msgid "None" msgstr "Ingen" diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po index 6710687a1..583331a64 100644 --- a/src/qt/languages/nl-NL.po +++ b/src/qt/languages/nl-NL.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Ongeldig PCap-apparaat" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Generieke peddelcontroller(s)" msgid "2-axis, 1-button joystick(s)" msgstr "Joystick(s) met 2 assen en 1 knoppen" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control systeem" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Roer Control Systeem" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 met adapter" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 zonder adapter" msgid "None" msgstr "Geen" diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 1efe0ec97..2383a1c1b 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 z Adaptorem" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 z adapterem" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 bez Adaptora" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 bez adaptera" msgid "None" msgstr "Żaden" diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 88fe48d00..f7f9dee2e 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Dispositivo PCap inválido" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Controlador(es) genérico(s) de pá" msgid "2-axis, 1-button joystick(s)" msgstr "Joystick(s) de 2 eixos, 1 botões" @@ -975,11 +975,11 @@ msgstr "Sistema de Controle de Voo Thrustmaster" msgid "Thrustmaster FCS + Rudder Control System" msgstr "SCV Thrustmaster + Sistema de Controle de Leme" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 com adaptador" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 sem adaptador" msgid "None" msgstr "Nenhum" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index bfd52adfa..7f2e56d64 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Dispositivo PCap inválido" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "COntrolador(es) genérico(s) tipo pá" msgid "2-axis, 1-button joystick(s)" msgstr "Joystick(s) de 2 eixos, 1 botões" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 com adaptador" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 sem adaptador" msgid "None" msgstr "Nenhum" diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index b40d4073e..9ea4a6a0e 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -975,10 +975,10 @@ msgstr "Система управления полётом Thrustmaster" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Система управления рулем" -msgid "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" msgstr "Thrustmaster Formula T1/T2 с адаптером" -msgid "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" msgstr "Thrustmaster Formula T1/T2 без адаптера" msgid "None" diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po index f43059d58..f8d53d19c 100644 --- a/src/qt/languages/sk-SK.po +++ b/src/qt/languages/sk-SK.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Neplatné PCap zariadenie" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Generický ovládač pádla" msgid "2-axis, 1-button joystick(s)" msgstr "2-osový, 1-tlačidlový joystick" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 s adaptérom" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 bez adaptéru" msgid "None" msgstr "Žiadne" diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index 2438c1aa3..fcd12d638 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Neveljavna naprava PCap" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Generični krmilnik z lopatico" msgid "2-axis, 1-button joystick(s)" msgstr "Igralna palica z 2 osema, 1 gumboma" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 s pretvornikom" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 brez pretvornika" msgid "None" msgstr "Brez" diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po index 324fed452..ce701efbb 100644 --- a/src/qt/languages/sv-SE.po +++ b/src/qt/languages/sv-SE.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Ogiltig PCap-enhet" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Generisk paddelkontroll(er)" msgid "2-axis, 1-button joystick(s)" msgstr "Styrspak med 2 axlar och 1 knappar" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 med adapter" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 utan adapter" msgid "None" msgstr "Ingen" diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index cf15db39b..8dda1d362 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Geçersiz PCap cihazı" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Genel kürek kontrol cihazları" msgid "2-axis, 1-button joystick(s)" msgstr "2 eksenli, 1 düğmeli oyun kolları" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Adaptörlü Thrustmaster Formula T1/T2" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Adaptörsüz Thrustmaster Formula T1/T2" msgid "None" msgstr "Hiçbiri" diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index b155d0da0..1c6017b51 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Невірний пристрій PCap" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Загальний контролер(и) весла" msgid "2-axis, 1-button joystick(s)" msgstr "2-осьовий, 1-кнопковий джойстик" @@ -975,11 +975,11 @@ msgstr "Система управління польотом Thrustmaster" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Система управління кермом" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 з адаптером" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 без адаптера" msgid "None" msgstr "Ні" diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po index acb904b04..7edddb94d 100644 --- a/src/qt/languages/vi-VN.po +++ b/src/qt/languages/vi-VN.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "Thiết bị PCap không hợp quy" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "Bộ điều khiển dạng mái chèo thông dụng" msgid "2-axis, 1-button joystick(s)" msgstr "Cần điều khiển hai trục, một nút" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Hệ thống bánh lái" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "Thrustmaster Formula T1/T2 kèm bộ chuyển đổi" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "Thrustmaster Formula T1/T2 không kèm bộ chuyển đổi" msgid "None" msgstr "Không có" diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index a53520c3f..58a98fc0c 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "无效 PCap 设备" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "通用桨式控制器" msgid "2-axis, 1-button joystick(s)" msgstr "2 轴, 1 键操纵杆" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "带适配器 Thrustmaster Formula T1/T2" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "不带适配器 Thrustmaster Formula T1/T2" msgid "None" msgstr "无" diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po index 053dde129..69055e9f0 100644 --- a/src/qt/languages/zh-TW.po +++ b/src/qt/languages/zh-TW.po @@ -850,7 +850,7 @@ msgid "Invalid PCap device" msgstr "無效 PCap 裝置" msgid "Generic paddle controller(s)" -msgstr "" +msgstr "通用槳式控制器" msgid "2-axis, 1-button joystick(s)" msgstr "2 軸, 1 鍵搖桿" @@ -975,11 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 with Adaptor" +msgid "Thrustmaster Formula T1/T2 with adapter" +msgstr "附轉接器 Thrustmaster Formula T1/T2" -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 without Adaptor" +msgid "Thrustmaster Formula T1/T2 without adapter" +msgstr "不附轉接器 Thrustmaster Formula T1/T2" msgid "None" msgstr "無" diff --git a/src/sound/snd_ad1848.c b/src/sound/snd_ad1848.c index c25890c50..8f120b157 100644 --- a/src/sound/snd_ad1848.c +++ b/src/sound/snd_ad1848.c @@ -521,7 +521,7 @@ readonly_x: } if (ad1848->type == AD1848_TYPE_CS4231) /* I23 is reserved and read-only on CS4231 non-A */ goto readonly_i; - if ((ad1848->type >= AD1848_TYPE_CS4232) || (ad1848->type <= AD1848_TYPE_CS4236)) /* I23 bits 7-1 are read-only on CS4231A/4232/4236 non-B, Win2k relies on this for detection */ + if ((ad1848->type >= AD1848_TYPE_CS4232) && (ad1848->type <= AD1848_TYPE_CS4236)) /* I23 bits 7-1 are read-only on CS4231A/4232/4236 non-B, Win2k relies on this for detection */ val = (val & 0x01); break;