80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box into qt

Browse Source
This commit is contained in:
ts-korhonen
2022-01-08 13:49:24 +02:00
parent 34de2d15cf 750f00d0dc
commit b5adb66a00
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sound/snd_mpu401.c
View File

@@ -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++)

6
src/win/languages/de-DE.rc
View File

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

6
src/win/languages/hr-HR.rc
View File

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