diff options
author | duck <me@duck.me.uk> | 2020-05-05 20:05:40 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-05 22:05:40 +0200 |
commit | e1c85e67a71493aa65e54717f847d21d66593e23 (patch) | |
tree | c085749a1007af19a79d962306bc479f2c751688 | |
parent | 19dc31e0b3fdcf7f8b29b18747870cecacde85df (diff) | |
download | openttd-e1c85e67a71493aa65e54717f847d21d66593e23.tar.xz |
Fix #8102: Update Windows installer strings to reference newer Windows version (#8114)
* Fix #8102: Update Windows installer strings to reference versions newer than 7
* Fix 2c53390: Version strings incorrectly capitalised
-rw-r--r-- | os/windows/installer/install.nsi | 4 | ||||
-rw-r--r-- | os/windows/installer/version_win32.txt | 2 | ||||
-rw-r--r-- | os/windows/installer/version_win64.txt | 2 | ||||
-rw-r--r-- | os/windows/installer/version_win9x.txt | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index b6837c559..7b9399228 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -599,12 +599,12 @@ Function CheckWindowsVersion StrCmp $R0 "win9x" 0 WinNT ClearErrors StrCmp ${APPARCH} "win9x" Done 0 - MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the Windows XP SP3, Vista and 7 version on Windows 95, 98, ME, 2000 and XP without SP3. This is will not work. Please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort + MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the Windows XP SP3 and newer version on Windows 95, 98, ME, 2000, or XP without SP3. This will not work - please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort GoTo Done WinNT: ClearErrors StrCmp ${APPARCH} "win9x" 0 Done - MessageBox MB_YESNO|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98, 2000 and XP without SP3 version on Windows XP SP3, Vista or 7. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort + MessageBox MB_YESNO|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98, 2000 and XP without SP3 version on Windows XP SP3 or newer. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort Abort: Quit Done: diff --git a/os/windows/installer/version_win32.txt b/os/windows/installer/version_win32.txt index a0aeef5ee..0ac06d0d1 100644 --- a/os/windows/installer/version_win32.txt +++ b/os/windows/installer/version_win32.txt @@ -1,5 +1,5 @@ !define APPBITS 32 ; Define number of bits for the architecture -!define EXTRA_VERSION "XP SP3, Vista and 7" +!define EXTRA_VERSION "XP SP3 and newer" !define APPARCH "win32" ; Define the application architecture !define BINARY_DIR "${PATH_ROOT}objs\win32\Release" InstallDir "$PROGRAMFILES32\OpenTTD\" diff --git a/os/windows/installer/version_win64.txt b/os/windows/installer/version_win64.txt index 492a75894..15ef51096 100644 --- a/os/windows/installer/version_win64.txt +++ b/os/windows/installer/version_win64.txt @@ -1,5 +1,5 @@ !define APPBITS 64 ; Define number of bits for the architecture -!define EXTRA_VERSION "XP, Vista and 7" +!define EXTRA_VERSION "XP and newer" !define APPARCH "win64" ; Define the application architecture !define BINARY_DIR "${PATH_ROOT}objs\x64\Release" InstallDir "$PROGRAMFILES64\OpenTTD\" diff --git a/os/windows/installer/version_win9x.txt b/os/windows/installer/version_win9x.txt index 21dbf6200..603778d73 100644 --- a/os/windows/installer/version_win9x.txt +++ b/os/windows/installer/version_win9x.txt @@ -1,5 +1,5 @@ !define APPBITS 32 ; Define number of bits for the architecture -!define EXTRA_VERSION "95, 98, ME, 2000 and XP without SP3" +!define EXTRA_VERSION "95, 98, ME, 2000 and XP SP2 or older" !define APPARCH "win9x" ; Define the application architecture !define BINARY_DIR "${PATH_ROOT}objs\release" InstallDir "$PROGRAMFILES32\OpenTTD\" |