Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662

This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2020-10-22 19:19:16 -04:00
parent 5949798dd4
commit 4c1bb11c29
5178 changed files with 1015907 additions and 83772 deletions

View File

@@ -253,9 +253,7 @@ FReply SAndroidLicenseDialog::OnAgree()
}
else
{
FText ErrorText = FText::Format(LOCTEXT("CouldntWriteLicense",
"Couldn't write license file {0}. Make sure you have the permissions to modify the file and try again."),
FText::FromString(LicenseFilename));
FText ErrorText = FText::Format(LOCTEXT("CouldntWriteLicense", "Couldn't write license file {0}. Make sure you have the permissions to modify the file and try again."), FText::FromString(LicenseFilename));
FPlatformMisc::MessageBoxExt(EAppMsgType::Ok, *ErrorText.ToString(), TEXT("Error"));
}
}