claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source 
# Conflicts:
#	.ci/build.sh
#	.ci/dependencies_msys.txt
#	src/sound/snd_audiopci.c
This commit is contained in:
RichardG867
2022-03-16 00:39:53 -03:00
parent f57cbe36b1 81cf8b7e8e
commit 71ba610366
257 changed files with 7949 additions and 6221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/unix/unix.c
View File

@@ -230,19 +230,23 @@ wchar_t* plat_get_string(int i)
switch (i)
{
case IDS_2077:
return L"Click to capture mouse.";
return L"Click to capture mouse";
case IDS_2078:
return L"Press CTRL-END to release mouse";
case IDS_2079:
return L"Press CTRL-END or middle button to release mouse";
case IDS_2080:
return L"Failed to initialize FluidSynth";
case IDS_2130:
return L"Invalid configuration";
case IDS_4099:
return L"MFM/RLL or ESDI CD-ROM drives never existed";
case IDS_2093:
return L"Failed to set up PCap";
case IDS_2094:
return L"No PCap devices found";
case IDS_2095:
return L"Invalid PCap device";
case IDS_2110:
return L"Unable to initialize FreeType";
case IDS_2111:
@@ -251,6 +255,8 @@ wchar_t* plat_get_string(int i)
return L"libfreetype is required for ESC/P printer emulation.";
case IDS_2132:
return L"libgs is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files.";
case IDS_2133:
return L"libfluidsynth is required for FluidSynth MIDI output.";
case IDS_2129:
return L"Make sure libpcap is installed and that you are on a libpcap-compatible network connection.";
case IDS_2114:
@@ -261,6 +267,8 @@ wchar_t* plat_get_string(int i)
return L"Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card.";
case IDS_2128:
return L"Hardware not available";
case IDS_2142:
return L"Monitor in sleep mode";
}
return L"";
}
@@ -286,10 +294,7 @@ plat_path_abs(char *path)
void
plat_path_normalize(char* path)
{
while (*path++ != 0)
{
if (*path == '\\') *path = '/';
}
/* No-op. */
}
void