diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 4b859f9e9..b3a61e925 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -593,7 +593,7 @@ monochrome_pal = green #DOSBOX-X-ADV:# pc-98 enable 256-color planar: Allow 256-color planar graphics mode if set, disable if not set. #DOSBOX-X-ADV:# This is a form of memory access in 256-color mode that existed for a short #DOSBOX-X-ADV:# time before later PC-9821 models removed it. This option must be enabled -#DOSBOX-X-ADV:# to use DOSBox-X with Windows 3.1 and it's built-in 256-color driver. +#DOSBOX-X-ADV:# to use DOSBox-X with Windows 3.1 and its built-in 256-color driver. # pc-98 enable 256-color: Allow 256-color graphics mode if set, disable if not set # pc-98 enable 16-color: Allow 16-color graphics mode if set, disable if not set # pc-98 enable grcg: Allow GRCG graphics functions if set, disable if not set @@ -2097,8 +2097,8 @@ timeout = 0 # Long filename (LFN) support will be enabled with a reported DOS version of 7.0 or higher with "lfn=auto" (default). # Similarly, FAT32 disk images will be supported with a reported DOS version of 7.1 or higher. # -# lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0. -# If set to autostart, the builtin VER command won't activate/deactivate LFN support according to the reported DOS version. +# lfn: Enable long filename support. If set to auto (default), LFN support is enabled if the reported DOS version is at least 7.0. +# If set to autostart, the built-in VER command won't activate/deactivate LFN support according to the reported DOS version. # Possible values: true, false, 1, 0, auto, autostart. # shellhigh: Load the DOSBox-X command shell into the upper memory when the UMB is available. # If set to auto (default), it is enabled if the reported DOS version is at least 7.0. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 544a2df1d..6e6d763b5 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1003,8 +1003,8 @@ timeout = 0 # Long filename (LFN) support will be enabled with a reported DOS version of 7.0 or higher with "lfn=auto" (default). # Similarly, FAT32 disk images will be supported with a reported DOS version of 7.1 or higher. # -# lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0. -# If set to autostart, the builtin VER command won't activate/deactivate LFN support according to the reported DOS version. +# lfn: Enable long filename support. If set to auto (default), LFN support is enabled if the reported DOS version is at least 7.0. +# If set to autostart, the built-in VER command won't activate/deactivate LFN support according to the reported DOS version. # Possible values: true, false, 1, 0, auto, autostart. # shellhigh: Load the DOSBox-X command shell into the upper memory when the UMB is available. # If set to auto (default), it is enabled if the reported DOS version is at least 7.0. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index fe50ef040..64d751452 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -577,7 +577,7 @@ monochrome_pal = green # pc-98 enable 256-color planar: Allow 256-color planar graphics mode if set, disable if not set. # This is a form of memory access in 256-color mode that existed for a short # time before later PC-9821 models removed it. This option must be enabled -# to use DOSBox-X with Windows 3.1 and it's built-in 256-color driver. +# to use DOSBox-X with Windows 3.1 and its built-in 256-color driver. # pc-98 enable 256-color: Allow 256-color graphics mode if set, disable if not set # pc-98 enable 16-color: Allow 16-color graphics mode if set, disable if not set # pc-98 enable grcg: Allow GRCG graphics functions if set, disable if not set @@ -2045,8 +2045,8 @@ timeout = 0 # Long filename (LFN) support will be enabled with a reported DOS version of 7.0 or higher with "lfn=auto" (default). # Similarly, FAT32 disk images will be supported with a reported DOS version of 7.1 or higher. # -# lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0. -# If set to autostart, the builtin VER command won't activate/deactivate LFN support according to the reported DOS version. +# lfn: Enable long filename support. If set to auto (default), LFN support is enabled if the reported DOS version is at least 7.0. +# If set to autostart, the built-in VER command won't activate/deactivate LFN support according to the reported DOS version. # Possible values: true, false, 1, 0, auto, autostart. # shellhigh: Load the DOSBox-X command shell into the upper memory when the UMB is available. # If set to auto (default), it is enabled if the reported DOS version is at least 7.0. diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 09001695c..d685ece38 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -1958,7 +1958,7 @@ void DOSBOX_SetupConfigSections(void) { Pbool->Set_help("Allow 256-color planar graphics mode if set, disable if not set.\n" "This is a form of memory access in 256-color mode that existed for a short\n" "time before later PC-9821 models removed it. This option must be enabled\n" - "to use DOSBox-X with Windows 3.1 and it's built-in 256-color driver."); + "to use DOSBox-X with Windows 3.1 and its built-in 256-color driver."); Pbool = secprop->Add_bool("pc-98 enable 256-color",Property::Changeable::WhenIdle,true); Pbool->Set_help("Allow 256-color graphics mode if set, disable if not set"); @@ -4121,8 +4121,8 @@ void DOSBOX_SetupConfigSections(void) { Pstring = secprop->Add_string("lfn",Property::Changeable::WhenIdle,"auto"); Pstring->Set_values(lfn_settings); - Pstring->Set_help("Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0.\n" - "If set to autostart, the builtin VER command won't activate/deactivate LFN support according to the reported DOS version."); + Pstring->Set_help("Enable long filename support. If set to auto (default), LFN support is enabled if the reported DOS version is at least 7.0.\n" + "If set to autostart, the built-in VER command won't activate/deactivate LFN support according to the reported DOS version."); Pstring->SetBasic(true); Pstring = secprop->Add_string("shellhigh",Property::Changeable::OnlyAtStart,"auto"); diff --git a/src/misc/messages.cpp b/src/misc/messages.cpp index 187dc9fce..b8e27b866 100644 --- a/src/misc/messages.cpp +++ b/src/misc/messages.cpp @@ -173,7 +173,7 @@ void LoadMessageFile(const char * fname) { if (!strcmp(p, "CODEPAGE")) { int c = atoi(r+1); if ((!res || control->opt_langcp) && c>0 && isSupportedCP(c)) { - if (((IS_PC98_ARCH||IS_JEGA_ARCH) && c!=437 && c!=932 && !systemmessagebox("DOSBox-X language file", "You have specified a language file which uses a code page incompatible with the Japanese PC-98 or JEGA/AX system.\n\nAre you sure to use the language file for this machine type?", "yesno","question", 2)) || (((IS_JDOSV && c!=932) || (IS_PDOSV && c!=936) || (IS_KDOSV && c!=949) || (IS_CDOSV && c!=950)) && c!=437 && !systemmessagebox("DOSBox-X language file", "You have specified a language file which uses a code page incompatible with the current DOS/V system.\n\nAre you sure to use the language file for this machine type?", "yesno","question", 2))) { + if (((IS_PC98_ARCH||IS_JEGA_ARCH) && c!=437 && c!=932 && !systemmessagebox("DOSBox-X language file", "You have specified a language file which uses a code page incompatible with the Japanese PC-98 or JEGA/AX system.\n\nAre you sure to use the language file for this machine type?", "yesno","question", 2)) || (((IS_JDOSV && c!=932) || (IS_PDOSV && c!=936) || (IS_KDOSV && c!=949) || (IS_CDOSV && c!=950)) && c!=437 && !systemmessagebox("DOSBox-X language file", "You have specified a language file which uses a code page incompatible with the current DOS/V system.\n\nAre you sure to use the language file for this system type?", "yesno","question", 2))) { fclose(mfile); dos.loaded_codepage = cp; return;