From 1063ac86fd01522b1ccc77d97455d2aeef1130dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <13226155+dhrdlicka@users.noreply.github.com> Date: Sun, 26 Oct 2025 01:59:50 +0200 Subject: [PATCH 1/4] Update Czech translation --- src/qt/languages/cs-CZ.po | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index 339fdc112..dea5fb3ec 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 "Obecný ovladač pádla" +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,21 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" +<<<<<<< HEAD +msgid "Thrustmaster Formula T1/T2 with Adaptor" +msgstr "Thrustmaster Formula T1/T2 s adaptérem" +======= msgid "Thrustmaster Formula T1/T2 with adapter" msgstr "Thrustmaster Formula T1/T2 s adaptérem" +>>>>>>> 0a80ae2debdb61f381194ed5f17b5579d5510cc4 +<<<<<<< HEAD +msgid "Thrustmaster Formula T1/T2 without Adaptor" +msgstr "Thrustmaster Formula T1/T2 bez adaptéru" +======= msgid "Thrustmaster Formula T1/T2 without adapter" msgstr "Thrustmaster Formula T1/T2 bez adaptéru" +>>>>>>> 0a80ae2debdb61f381194ed5f17b5579d5510cc4 msgid "None" msgstr "Žadné" @@ -1852,10 +1862,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" From 41f2c0ac0bbf3c3406acf93d53af1b32209726a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <13226155+dhrdlicka@users.noreply.github.com> Date: Sun, 26 Oct 2025 02:07:16 +0200 Subject: [PATCH 2/4] Remove merge conflict in Czech translation --- src/qt/languages/cs-CZ.po | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index dea5fb3ec..7dd1e5d7a 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -975,21 +975,11 @@ msgstr "Thrustmaster Flight Control System" msgid "Thrustmaster FCS + Rudder Control System" msgstr "Thrustmaster FCS + Rudder Control System" -<<<<<<< HEAD -msgid "Thrustmaster Formula T1/T2 with Adaptor" -msgstr "Thrustmaster Formula T1/T2 s adaptérem" -======= msgid "Thrustmaster Formula T1/T2 with adapter" msgstr "Thrustmaster Formula T1/T2 s adaptérem" ->>>>>>> 0a80ae2debdb61f381194ed5f17b5579d5510cc4 -<<<<<<< HEAD -msgid "Thrustmaster Formula T1/T2 without Adaptor" -msgstr "Thrustmaster Formula T1/T2 bez adaptéru" -======= msgid "Thrustmaster Formula T1/T2 without adapter" msgstr "Thrustmaster Formula T1/T2 bez adaptéru" ->>>>>>> 0a80ae2debdb61f381194ed5f17b5579d5510cc4 msgid "None" msgstr "Žadné" From 5a42a7c6f484271d5d02e3a3e1d4987520832ce9 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 25 Oct 2025 21:29:40 -0300 Subject: [PATCH 3/4] Remove some unnecessary backslashes --- src/mem/rom.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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)); } From 3b43627f38f8a5a5d9faa5a2640820d9be8b4663 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 25 Oct 2025 21:39:21 -0300 Subject: [PATCH 4/4] Add forgotten machine migration for MS-6119 --- src/config.c | 1 + 1 file changed, 1 insertion(+) 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 } };