From e11ef604ebc82bd5bbfea328906513e815fa568c Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Wed, 25 Jan 2023 16:09:14 +0700 Subject: [PATCH] chore(windows): split long string into 3 --- windows/src/desktop/setup/SetupStrings.pas | 4 +++- windows/src/desktop/setup/bootstrapmain.pas | 4 +++- windows/src/desktop/setup/locale/en/strings.xml | 9 +++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/windows/src/desktop/setup/SetupStrings.pas b/windows/src/desktop/setup/SetupStrings.pas index bbfb6fd28e..69227320eb 100644 --- a/windows/src/desktop/setup/SetupStrings.pas +++ b/windows/src/desktop/setup/SetupStrings.pas @@ -101,7 +101,9 @@ type ssDownloadingTitle, ssDownloadingText, - ssOffline + ssOffline, + ssOffline2, + ssOffline3 ); implementation diff --git a/windows/src/desktop/setup/bootstrapmain.pas b/windows/src/desktop/setup/bootstrapmain.pas index 26db706ea4..28ac6a6257 100644 --- a/windows/src/desktop/setup/bootstrapmain.pas +++ b/windows/src/desktop/setup/bootstrapmain.pas @@ -397,7 +397,9 @@ begin end else begin - case MessageDlgW(FInstallInfo.Text(ssOffline), mtError, mbAbortRetryIgnore, 0) of + case MessageDlgW( + Trim(FInstallInfo.Text(ssOffline)+#13#10#13#10+FInstallInfo.Text(ssOffline2)+#13#10#13#10+FInstallInfo.Text(ssOffline3)), + mtError, mbAbortRetryIgnore, 0) of mrAbort: Exit(False); mrRetry: Continue; mrIgnore: FForceOffline := True; diff --git a/windows/src/desktop/setup/locale/en/strings.xml b/windows/src/desktop/setup/locale/en/strings.xml index 590dbd9426..b5155ecf5b 100644 --- a/windows/src/desktop/setup/locale/en/strings.xml +++ b/windows/src/desktop/setup/locale/en/strings.xml @@ -98,10 +98,7 @@ Restart now? Downloading %0:s - $APPNAME Setup could not connect to keyman.com to download additional resources. - -Please check that you are online, and give $APPNAME Setup permission to access the Internet in your firewall settings. - -Click Abort to exit Setup, Retry to try and download resources again, or Ignore to continue offline. - + $APPNAME Setup could not connect to keyman.com to download additional resources. + Please check that you are online, and give $APPNAME Setup permission to access the Internet in your firewall settings. + Click Abort to exit Setup, Retry to try and download resources again, or Ignore to continue offline. \ No newline at end of file