mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 02:18:20 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into TC1995

Browse Source
This commit is contained in:
TC1995
2025-10-26 13:02:42 +01:00
parent 99fec4ab00 3b43627f38
commit ddd2672949
27 changed files with 135 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.c
View File

@@ -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 }
};

4
src/game/joystick_standard.c
View File

@@ -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,

18
src/mem/rom.c
View File

@@ -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));
}

32
src/qt/languages/cs-CZ.po
View File

@@ -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"

10
src/qt/languages/de-DE.po
View File

@@ -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"

10
src/qt/languages/es-ES.po
View File

@@ -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"

10
src/qt/languages/fi-FI.po
View File

@@ -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"

10
src/qt/languages/fr-FR.po
View File

@@ -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"

10
src/qt/languages/hr-HR.po
View File

@@ -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"

10
src/qt/languages/it-IT.po
View File

@@ -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"

10
src/qt/languages/ja-JP.po
View File

@@ -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 "なし"

10
src/qt/languages/ko-KR.po
View File

@@ -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 "없음"

10
src/qt/languages/nb-NO.po
View File

@@ -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"

10
src/qt/languages/nl-NL.po
View File

@@ -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"

8
src/qt/languages/pl-PL.po
View File

@@ -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"

10
src/qt/languages/pt-BR.po
View File

@@ -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"

10
src/qt/languages/pt-PT.po
View File

@@ -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"

4
src/qt/languages/ru-RU.po
View File

@@ -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"

10
src/qt/languages/sk-SK.po
View File

@@ -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"

10
src/qt/languages/sl-SI.po
View File

@@ -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"

10
src/qt/languages/sv-SE.po
View File

@@ -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"

10
src/qt/languages/tr-TR.po
View File

@@ -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"

10
src/qt/languages/uk-UA.po
View File

@@ -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 "Ні"

10
src/qt/languages/vi-VN.po
View File

@@ -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ó"

10
src/qt/languages/zh-CN.po
View File

@@ -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 "无"

10
src/qt/languages/zh-TW.po
View File

@@ -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 "無"

2
src/sound/snd_ad1848.c
View File

@@ -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;