From c4448492e816bf01bec5ac73dfe0734e7c429156 Mon Sep 17 00:00:00 2001 From: dob205 Date: Fri, 7 Jan 2022 17:16:18 +0100 Subject: [PATCH 1/5] Adjustments to the German translation Aligns the German translation to the CHS used in the disk overview table and fixes smaller mishaps --- src/win/languages/de-DE.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 0f1e35650..5a5ca5914 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -382,8 +382,8 @@ END #define STR_ISAMEM_2 "Steckkarte 2:" #define STR_ISAMEM_3 "Steckkarte 3:" #define STR_ISAMEM_4 "Steckkarte 4:" -#define STR_BUGGER "ISABugger-Gerät:" -#define STR_POSTCARD "POST-Code-Karte:" +#define STR_BUGGER "ISABugger-Gerät" +#define STR_POSTCARD "POST-Code-Karte" #define FONT_SIZE 9 #define FONT_NAME "Segoe UI" @@ -464,7 +464,7 @@ BEGIN IDS_2104 "Tastaturbeschleuniger konnten nicht geladen werden." IDS_2105 "Roheingaben konnten nicht registriert werden." IDS_2106 "%u" - IDS_2107 "%u MB (ZKS: %i, %i, %i)" + IDS_2107 "%u MB (CHS: %i, %i, %i)" IDS_2108 "Diskette %i (%s): %ls" IDS_2109 "Alle Images (*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF)\0*.0??;*.1??;*.??0;*.86F;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.JSON;*.TD0;*.*FD?;*.MFM;*.XDF\0Fortgeschrittene Sektorimages (*.IMD;*.JSON;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basissektorimages (*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?)\0*.0??;*.1??;*.??0;*.BIN;*.CQ?;*.D??;*.FLP;*.HDM;*.IM?;*.XDF;*.*FD?\0Fluximages (*.FDI)\0*.FDI\0Oberflächenimages (*.86F;*.MFM)\0*.86F;*.MFM\0Alle Dateien (*.*)\0*.*\0" IDS_2110 "FreeType konnte nicht initialisiert werden" From 6122aff602b699a40f41eb0e84bb2d49f5676ed3 Mon Sep 17 00:00:00 2001 From: dob205 Date: Fri, 7 Jan 2022 17:22:59 +0100 Subject: [PATCH 2/5] Updates to hr-HR.rc Translates previously untranslated renderer messages and fixes small glitches --- src/win/languages/hr-HR.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index c6d4c4cc5..61fc0c475 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -376,7 +376,7 @@ END #define STR_ZIP_DRIVES "ZIP pogoni:" #define STR_250 "ZIP 250" -#define STR_ISARTC "Ura u stvarnom vrijemenu RTC:" +#define STR_ISARTC "Sat stvarnog vremena (RTC):" #define STR_ISAMEM "Proširenje memorije ISA" #define STR_ISAMEM_1 "Kartica 1:" #define STR_ISAMEM_2 "Kartica 2:" @@ -530,8 +530,8 @@ BEGIN IDS_2149 "Slike audio kasete (*.PCM;*.RAW;*.WAV;*.CAS)\0*.PCM;*.RAW;*.WAV;*.CAS\0Sve datoteke (*.*)\0*.*\0" IDS_2150 "Kaseta %i: %ls" IDS_2151 "Slike kasete (*.A;*.B;*.JRC)\0*.A;*.B;*.JRC\0Sve datoteke (*.*)\0*.*\0" - IDS_2152 "Error initializing renderer" - IDS_2153 "OpenGL (3.0 Core) renderer could not be initialized. Use another renderer." + IDS_2152 "Nije moguće inicijalizirati renderer" + IDS_2153 "Nije moguće inicijalizirati OpenGL (3.0 jezgra) renderer. Molimte koristite drugi renderer." END STRINGTABLE DISCARDABLE From edc8c88062ae6eebbf82513bf47a8adb5fba35b7 Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Fri, 7 Jan 2022 23:36:25 +0200 Subject: [PATCH 3/5] Properly UART-mode detection on input sysex messages --- src/sound/snd_mpu401.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/snd_mpu401.c b/src/sound/snd_mpu401.c index 5ada36829..12e92b905 100644 --- a/src/sound/snd_mpu401.c +++ b/src/sound/snd_mpu401.c @@ -1388,7 +1388,7 @@ MPU401_InputSysex(void *p, uint8_t *buffer, uint32_t len, int abort) #ifdef DOSBOX_CODE if (mpu->mode == M_UART) { #else - if (!mpu->intelligent && mpu->mode == M_UART) { + if (!mpu->intelligent || mpu->mode == M_UART) { #endif /* UART mode input. */ for (i = 0; i < len; i++) From 34de2d15cff8365004783e0b201c5ab8f0540880 Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Sat, 8 Jan 2022 13:40:45 +0200 Subject: [PATCH 4/5] qt: Fix type error --- src/qt/qt_platform.cpp | 45 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index 807b64a52..a53634f45 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -374,28 +374,31 @@ void set_language(uint32_t id) { lang_id = id; } -QMap> ProgSettings::lcid_langcode = +extern "C++" { - {0x0405, {"cs-CZ", "Czech (Czech Republic)"} }, - {0x0407, {"de-DE", "German (Germany)"} }, - {0x0408, {"en-US", "English (United States)"} }, - {0x0809, {"en-GB", "English (United Kingdom)"} }, - {0x0C0A, {"es-ES", "Spanish (Spain)"} }, - {0x040B, {"fi-FI", "Finnish (Finland)"} }, - {0x040C, {"fr-FR", "French (France)"} }, - {0x041A, {"hr-HR", "Croatian (Croatia)"} }, - {0x040E, {"hu-HU", "Hungarian (Hungary)"} }, - {0x0410, {"it-IT", "Italian (Italy)"} }, - {0x0411, {"ja-JP", "Japanese (Japan)"} }, - {0x0412, {"ko-KR", "Korean (Korea)"} }, - {0x0416, {"pt-BR", "Portuguese (Brazil)"} }, - {0x0816, {"pt-PT", "Portuguese (Portugal)"} }, - {0x0419, {"ru-RU", "Russian (Russia)"} }, - {0x0424, {"sl-SI", "Slovenian (Slovenia)"} }, - {0x041F, {"tr-TR", "Turkish (Turkey)"} }, - {0x0804, {"zh-CN", "Chinese (China)"} }, - {0xFFFF, {"system", "(System Default)"} }, -}; + QMap> ProgSettings::lcid_langcode = + { + {0x0405, {"cs-CZ", "Czech (Czech Republic)"} }, + {0x0407, {"de-DE", "German (Germany)"} }, + {0x0408, {"en-US", "English (United States)"} }, + {0x0809, {"en-GB", "English (United Kingdom)"} }, + {0x0C0A, {"es-ES", "Spanish (Spain)"} }, + {0x040B, {"fi-FI", "Finnish (Finland)"} }, + {0x040C, {"fr-FR", "French (France)"} }, + {0x041A, {"hr-HR", "Croatian (Croatia)"} }, + {0x040E, {"hu-HU", "Hungarian (Hungary)"} }, + {0x0410, {"it-IT", "Italian (Italy)"} }, + {0x0411, {"ja-JP", "Japanese (Japan)"} }, + {0x0412, {"ko-KR", "Korean (Korea)"} }, + {0x0416, {"pt-BR", "Portuguese (Brazil)"} }, + {0x0816, {"pt-PT", "Portuguese (Portugal)"} }, + {0x0419, {"ru-RU", "Russian (Russia)"} }, + {0x0424, {"sl-SI", "Slovenian (Slovenia)"} }, + {0x041F, {"tr-TR", "Turkish (Turkey)"} }, + {0x0804, {"zh-CN", "Chinese (China)"} }, + {0xFFFF, {"system", "(System Default)"} }, + }; +} /* Sets up the program language before initialization. */ uint32_t plat_language_code(char* langcode) { From 021ec8e50d72e339e6d35c48c4265afa43d0755c Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Sat, 8 Jan 2022 15:36:52 +0200 Subject: [PATCH 5/5] qt: Make QT default off to prepare merging to upstream --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f003bcb60..424e08ec3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ option(CPPTHREADS "C++11 threads" option(NEW_DYNAREC "Use the PCem v15 (\"new\") dynamic recompiler" OFF) option(MINITRACE "Enable Chrome tracing using the modified minitrace library" OFF) option(DEV_BRANCH "Development branch" OFF) -option(QT "QT GUI" ON) +option(QT "QT GUI" OFF) # Development branch features # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 765a714e6..6bc00b432 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -240,7 +240,7 @@ if (APPLE) endif() if (QT) - add_subdirectory(qt) + add_subdirectory(qt) elseif(WIN32) add_subdirectory(win) else()