Merging //UE4/Dev-Main@4680011 to Dev-Rendering (//UE4/Dev-Rendering)

#rb none

[CL 4680455 by Marcus Wassmer in Dev-Rendering branch]
This commit is contained in:
Marcus Wassmer
2019-01-03 19:28:34 -05:00
parent cbfcbbb93b
commit 834e95f3d3
2432 changed files with 16117 additions and 8871 deletions

View File

@@ -698,7 +698,7 @@ namespace
FText SLocalizationCommandletExecutor::GetCloseButtonText() const
{
return HasCompleted() ? LOCTEXT("OkayButtonText", "Okay") : LOCTEXT("CancelButtonText", "Cancel");
return HasCompleted() ? LOCTEXT("OkButtonText", "OK") : LOCTEXT("CancelButtonText", "Cancel");
}
FReply SLocalizationCommandletExecutor::OnCloseButtonClicked()