mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 04:45:31 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into MS5146_1998

Browse Source
This commit is contained in:
Verloren50000
2025-10-26 10:41:02 +08:00
committed by GitHub
parent 409c1733e6 3b43627f38
commit 72b90072b7
40 changed files with 249 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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 }
};
@@ -1501,7 +1502,7 @@ load_floppy_and_cdrom_drives(void)
sprintf(temp, "cdrom_%02i_type", c + 1);
p = ini_section_get_string(cat, temp, cdrom[c].bus_type == CDROM_BUS_MKE ? "cr563" : "86cd");
/* TODO: Configuration migration, remove when no longer needed. */
int cdrom_type = cdrom_get_from_internal_name(p);
int cdrom_type = cdrom_get_from_internal_name(!strcmp(p, "goldstar") ? "goldstar_r560b" : p);
if (cdrom_type == -1) {
cdrom_type = cdrom_get_from_name(p);
if (cdrom_type == -1)

146
src/device.c
View File

@@ -396,143 +396,69 @@ device_available(const device_t *dev)
return ret;
}
uint8_t
device_get_bios_type(const device_t *dev, const char *internal_name)
static const device_config_bios_t *
device_get_bios(const device_t *dev, const char *internal_name)
{
if (dev != NULL) {
const device_config_t *config = dev->config;
if (config != NULL) {
while (config->type != CONFIG_END) {
if (config->type == CONFIG_BIOS) {
const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
while ((bios != NULL) &&
(bios->name != NULL) &&
(bios->internal_name != NULL) &&
(bios->files_no != 0)) {
if (!strcmp(internal_name, bios->internal_name))
return bios->bios_type;
bios++;
}
while (config && (config->type != CONFIG_END)) {
if (config->type == CONFIG_BIOS) {
const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
/* Go through the ROMs in the device configuration. */
while ((bios != NULL) &&
(bios->name != NULL) &&
(bios->internal_name != NULL) &&
(bios->files_no != 0)) {
if (!strcmp(internal_name, bios->internal_name))
return bios;
bios++;
}
config++;
/* Unknown value, fall back to the default ROMs. */
if (strcmp(internal_name, config->default_string))
return device_get_bios(dev, config->default_string);
}
config++;
}
}
return 0;
return NULL;
}
uint8_t
device_get_bios_type(const device_t *dev, const char *internal_name)
{
const device_config_bios_t *bios = device_get_bios(dev, internal_name);
return bios ? bios->bios_type : 0;
}
uint8_t
device_get_bios_num_files(const device_t *dev, const char *internal_name)
{
if (dev != NULL) {
const device_config_t *config = dev->config;
if (config != NULL) {
while (config->type != CONFIG_END) {
if (config->type == CONFIG_BIOS) {
const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
while ((bios != NULL) &&
(bios->name != NULL) &&
(bios->internal_name != NULL) &&
(bios->files_no != 0)) {
if (!strcmp(internal_name, bios->internal_name))
return bios->files_no;
bios++;
}
}
config++;
}
}
}
return 0;
const device_config_bios_t *bios = device_get_bios(dev, internal_name);
return bios ? bios->files_no : 0;
}
uint32_t
device_get_bios_local(const device_t *dev, const char *internal_name)
{
if (dev != NULL) {
const device_config_t *config = dev->config;
if (config != NULL) {
while (config->type != CONFIG_END) {
if (config->type == CONFIG_BIOS) {
const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
while ((bios != NULL) &&
(bios->name != NULL) &&
(bios->internal_name != NULL) &&
(bios->files_no != 0)) {
if (!strcmp(internal_name, bios->internal_name))
return bios->local;
bios++;
}
}
config++;
}
}
}
return 0;
const device_config_bios_t *bios = device_get_bios(dev, internal_name);
return bios ? bios->local : 0;
}
uint32_t
device_get_bios_file_size(const device_t *dev, const char *internal_name)
{
if (dev != NULL) {
const device_config_t *config = dev->config;
if (config != NULL) {
while (config->type != CONFIG_END) {
if (config->type == CONFIG_BIOS) {
const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
/* Go through the ROM's in the device configuration. */
while ((bios != NULL) &&
(bios->name != NULL) &&
(bios->internal_name != NULL) &&
(bios->files_no != 0)) {
if (!strcmp(internal_name, bios->internal_name))
return bios->size;
bios++;
}
}
config++;
}
}
}
return 0;
const device_config_bios_t *bios = device_get_bios(dev, internal_name);
return bios ? bios->size : 0;
}
const char *
device_get_bios_file(const device_t *dev, const char *internal_name, int file_no)
device_get_bios_file(const device_t *dev, const char *internal_name, unsigned int file_no)
{
if (dev != NULL) {
const device_config_t *config = dev->config;
if (config != NULL) {
while (config->type != CONFIG_END) {
if (config->type == CONFIG_BIOS) {
const device_config_bios_t *bios = (const device_config_bios_t *) config->bios;
/* Go through the ROM's in the device configuration. */
while ((bios != NULL) &&
(bios->name != NULL) &&
(bios->internal_name != NULL) &&
(bios->files_no != 0)) {
if (!strcmp(internal_name, bios->internal_name)) {
if (file_no < bios->files_no)
return bios->files[file_no];
else
return NULL;
}
bios++;
}
}
config++;
}
}
}
/* A NULL device is never available. */
return (NULL);
const device_config_bios_t *bios = device_get_bios(dev, internal_name);
return (bios && (file_no < bios->files_no)) ? bios->files[file_no] : NULL;
}
int

30
src/game/joystick_standard.c
View File

@@ -235,6 +235,26 @@ joystick_standard_read_axis_2axis(UNUSED(void *priv), int axis)
}
}
static int
joystick_standard_read_axis_2axis_t1t2wa(UNUSED(void *priv), int axis)
{
uint8_t gp = 0;
if (!JOYSTICK_PRESENT(gp, 0))
return AXIS_NOT_PRESENT;
switch (axis) {
case 0:
return joystick_state[gp][0].axis[0];
case 2:
return joystick_state[gp][0].axis[1];
case 1:
case 3:
default:
return 0;
}
}
#if 0
// For later use
static int
@@ -879,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,
@@ -898,19 +918,19 @@ 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,
.read = joystick_standard_read_4button,
.write = joystick_standard_write,
.read_axis = joystick_standard_read_axis_3axis,
.read_axis = joystick_standard_read_axis_2axis_t1t2wa,
.a0_over = joystick_standard_a0_over,
.axis_count = 3,
.axis_count = 2,
.button_count = 4,
.pov_count = 0,
.max_joysticks = 1,
.axis_names = { "Steering axis", "Accelerator axis", "Brake axis" },
.axis_names = { "Steering axis", "Accelerator/Brake axis" },
.button_names = { "Shifter Up", "Shifter Down", "Top Console Switch", "Bottom Console Switch" },
.pov_names = { NULL }
};

2
src/include/86box/device.h
View File

@@ -213,7 +213,7 @@ extern uint8_t device_get_bios_type(const device_t *dev, const char *interna
extern uint8_t device_get_bios_num_files(const device_t *dev, const char *internal_name);
extern uint32_t device_get_bios_local(const device_t *dev, const char *internal_name);
extern uint32_t device_get_bios_file_size(const device_t *dev, const char *internal_name);
extern const char *device_get_bios_file(const device_t *dev, const char *internal_name, int file_no);
extern const char *device_get_bios_file(const device_t *dev, const char *internal_name, unsigned int file_no);
extern int device_is_valid(const device_t *, int mch);

4
src/include/86box/machine.h
View File

@@ -971,9 +971,9 @@ extern const device_t p54tp4xe_device;
extern int machine_at_p54tp4xe_init(const machine_t *);
extern int machine_at_exp8551_init(const machine_t *);
#ifdef EMU_DEVICE_H
extern const device_t hpvectravexxx_device;
extern const device_t vectra52_device;
#endif
extern int machine_at_hpvectravexxx_init(const machine_t *);
extern int machine_at_vectra52_init(const machine_t *);
extern int machine_at_vectra500mt_init(const machine_t *);
extern int machine_at_vectra54_init(const machine_t *);
#ifdef EMU_DEVICE_H

4
src/machine/m_at_286.c
View File

@@ -345,14 +345,14 @@ static const device_config_t pc900_config[] = {
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "pc900_v207a",
.default_string = "pc900",
.default_int = 0,
.file_filter = "",
.spinner = { 0 },
.bios = {
{
.name = "BIOS V2.07A",
.internal_name = "pc900_v207a",
.internal_name = "pc900",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,

4
src/machine/m_at_386dx.c
View File

@@ -346,7 +346,7 @@ static const device_config_t dataexpert386wb_config[] = {
.bios = {
{
.name = "AMIBIOS 050591",
.internal_name = "ami386wb",
.internal_name = "dataexpert386wb_050591",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
@@ -370,7 +370,7 @@ static const device_config_t dataexpert386wb_config[] = {
};
const device_t dataexpert386wb_device = {
.name = "DataExpert 386WB",
.name = "DataExpert 386C",
.internal_name = "dataexpert386wb_device",
.flags = 0,
.local = 0,

2
src/machine/m_at_socket4.c
View File

@@ -181,7 +181,7 @@ static const device_config_t p5mp3_config[] = {
},
{
.name = "Award Modular BIOS v4.51G - Revision 0402 (Beta)",
.internal_name = "p5mp3_beta",
.internal_name = "p5mp3_0402",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,

6
src/machine/m_at_socket7.c
View File

@@ -1914,7 +1914,7 @@ static const device_config_t r534f_config[] = {
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "r534f",
.default_string = "r534f_1998",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
@@ -1922,7 +1922,7 @@ static const device_config_t r534f_config[] = {
.bios = {
{
.name = "Award Modular BIOS v4.51PG - Revision 06/12/1998",
.internal_name = "r534f",
.internal_name = "r534f_1998",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
@@ -1931,7 +1931,7 @@ static const device_config_t r534f_config[] = {
},
{
.name = "Award Modular BIOS v4.51PG - Revision 03/13/2000 (by Unicore Software)",
.internal_name = "r534f_unicore",
.internal_name = "r534f",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,

46
src/machine/m_at_socket7_3v.c
View File

@@ -158,38 +158,38 @@ machine_at_exp8551_init(const machine_t *model)
}
static void
machine_at_hpvectravexxx_gpio_init(void)
machine_at_vectra52_gpio_init(void)
{
uint32_t gpio = 0x40;
if (cpu_busspeed <= 40000000)
gpio |= 0x30;
else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
if (cpu_busspeed <= 40000000)
gpio |= 0x30;
else if ((cpu_busspeed > 40000000) && (cpu_busspeed <= 50000000))
gpio |= 0x00;
else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
gpio |= 0x20;
else if (cpu_busspeed > 60000000)
else if ((cpu_busspeed > 50000000) && (cpu_busspeed <= 60000000))
gpio |= 0x20;
else if (cpu_busspeed > 60000000)
gpio |= 0x10;
if (cpu_dmulti <= 1.5)
if (cpu_dmulti <= 1.5)
gpio |= 0x82;
else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
else if ((cpu_dmulti > 1.5) && (cpu_dmulti <= 2.0))
gpio |= 0x02;
else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
else if ((cpu_dmulti > 2.0) && (cpu_dmulti <= 2.5))
gpio |= 0x00;
else if (cpu_dmulti > 2.5)
else if (cpu_dmulti > 2.5)
gpio |= 0x80;
machine_set_gpio_default(gpio);
}
static const device_config_t hpvectravexxx_config[] = {
static const device_config_t vectra52_config[] = {
// clang-format off
{
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "gu_07_05",
.default_string = "vectra52_0705",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
@@ -197,21 +197,21 @@ static const device_config_t hpvectravexxx_config[] = {
.bios = {
{
.name = "GU.07.02 (01/25/96)",
.internal_name = "gu_07_02",
.internal_name = "vectra52_0702",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
.size = 131072,
.files = { "roms/machines/hpvectravexxx/d3653.bin", "" }
.files = { "roms/machines/vectra52/d3653.bin", "" }
},
{
.name = "GU.07.05 (08/06/96)",
.internal_name = "gu_07_05",
.internal_name = "vectra52_0705",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,
.size = 131072,
.files = { "roms/machines/hpvectravexxx/GU0705US.FUL", "" }
.files = { "roms/machines/vectra52/GU0705US.FUL", "" }
},
{ .files_no = 0 }
}
@@ -220,9 +220,9 @@ static const device_config_t hpvectravexxx_config[] = {
// clang-format on
};
const device_t hpvectravexxx_device = {
.name = "HP Vectra VE 5/XXX Series 2",
.internal_name = "hpvectravexxx_device",
const device_t vectra52_device = {
.name = "HP Vectra VE 5/xxx Series 2",
.internal_name = "vectra52",
.flags = 0,
.local = 0,
.init = NULL,
@@ -231,11 +231,11 @@ const device_t hpvectravexxx_device = {
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = hpvectravexxx_config
.config = vectra52_config
};
int
machine_at_hpvectravexxx_init(const machine_t *model)
machine_at_vectra52_init(const machine_t *model)
{
int ret = 0;
const char *fn;
@@ -250,7 +250,7 @@ machine_at_hpvectravexxx_init(const machine_t *model)
device_context_restore();
machine_at_common_init_ex(model, 2);
machine_at_hpvectravexxx_gpio_init();
machine_at_vectra52_gpio_init();
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);

6
src/machine/m_pcjr.c
View File

@@ -832,8 +832,8 @@ static const device_config_t pcjr_config[] = {
.bios = { { 0 } }
},
{
.name = "ir_reciever",
.description = "Enable IR Reciever",
.name = "ir_receiver",
.description = "Enable IR Receiver",
.type = CONFIG_BINARY,
.default_string = NULL,
.default_int = 0,
@@ -883,7 +883,7 @@ machine_pcjr_init(UNUSED(const machine_t *model))
#endif
pcjr->option_fdc = 0;
#if 0
pcjr->option_ir = device_get_config_int("ir_reciever");
pcjr->option_ir = device_get_config_int("ir_receiver");
#else
pcjr->option_ir = 0;
#endif

4
src/machine/m_xt.c
View File

@@ -902,7 +902,7 @@ static const device_config_t dtk_config[] = {
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "dtk_242",
.default_string = "dtk",
.default_int = 0,
.file_filter = NULL,
.spinner = { 0 },
@@ -919,7 +919,7 @@ static const device_config_t dtk_config[] = {
},
{
.name = "2.42",
.internal_name = "dtk_242",
.internal_name = "dtk",
.bios_type = BIOS_NORMAL,
.files_no = 1,
.local = 0,

8
src/machine/machine_table.c
View File

@@ -13378,10 +13378,10 @@ const machine_t machines[] = {
},
{
.name = "[i430FX] HP Vectra VE 5/xxx Series 2",
.internal_name = "hpvectravexxx",
.internal_name = "vectra52",
.type = MACHINE_TYPE_SOCKET7_3V,
.chipset = MACHINE_CHIPSET_INTEL_430FX,
.init = machine_at_hpvectravexxx_init,
.init = machine_at_vectra52_init,
.p1_handler = machine_generic_p1_handler,
.gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE,
@@ -13411,7 +13411,7 @@ const machine_t machines[] = {
.kbc_p1 = 0x00000cf0,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &hpvectravexxx_device,
.device = &vectra52_device,
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
@@ -20319,7 +20319,7 @@ machine_get_nvr_name_ex(int m)
if (dev != NULL) {
device_context(dev);
const char *bios = device_get_config_string("bios");
const char *bios = device_get_config_bios("bios");
if ((bios != NULL) && (strcmp(bios, "") != 0))
ret = bios;
device_context_restore();

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

7
src/network/net_rtl8139.c
View File

@@ -3257,14 +3257,9 @@ nic_init(const device_t *info)
eep_data[1] = 0x10EC;
eep_data[2] = 0x8139;
/* XXX: Get proper MAC addresses from real EEPROM dumps. OID taken from net_ne2000.c */
#ifdef USE_REALTEK_OID
/* XXX: Get proper MAC addresses from real EEPROM dumps. OID is generic Realtek */
eep_data[7] = 0xe000;
eep_data[8] = 0x124c;
#else
eep_data[7] = 0x1400;
eep_data[8] = 0x122a;
#endif
eep_data[9] = 0x1413;
mac_bytes = (uint8_t *) &(eep_data[7]);

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;

15
src/video/vid_s3.c
View File

@@ -4536,16 +4536,21 @@ s3_recalctimings(svga_t *svga)
break;
case SC1502X: /*SC15025 RAMDAC*/
if (svga->getclock == icd2061_getclock) { /*ICD2061 clock chip*/
s3_log("32bpp 928 ISA VL SC1502X double=%02x, highres=%02x, dotperclock=%d, clksel=%d, pitch=%d, hdisp=%d, clock=%02x.\n",
svga->crtc[0x31] & 0x02, s3->accel.advfunc_cntl & 0x04, svga->dots_per_clock, clk_sel, s3->width, svga->hdisp, svga->crtc[0x67] >> 4);
if (svga->crtc[0x31] & 0x02) {
svga->hdisp >>= 1;
svga->dots_per_clock >>= 1;
if (svga->hdisp == 640)
s3->width = 1024;
if (svga->dots_per_clock == 16) {
svga->hdisp >>= 1;
svga->dots_per_clock >>= 1;
svga->clock *= 2.0;
if (svga->hdisp == 640)
s3->width = 1024;
}
} else {
svga->hdisp >>= 2;
svga->dots_per_clock >>= 2;
if (svga->hdisp == 800)
s3->width = 1024;
svga->clock *= 2.0;
}
}
break;