Merge remote-tracking branch 'origin/master' into ys_imperial_unit

This commit is contained in:
YuSanka 2020-04-30 09:49:15 +02:00
commit c717b16526

View file

@ -74,11 +74,11 @@ struct CurlGlobalInit
"PrusaSlicer will be unable to establish secure " "PrusaSlicer will be unable to establish secure "
"network connections."); "network connections.");
else else
message = Slic3r::format( message = Slic3r::GUI::format(
_L("PrusaSlicer detected system SSL certificate store in: %1%"), _L("PrusaSlicer detected system SSL certificate store in: %1%"),
bundle); bundle);
message += "\n" + Slic3r::format( message += "\n" + Slic3r::GUI::format(
_L("To specify the system certificate store manually, please " _L("To specify the system certificate store manually, please "
"set the %1% environment variable to the correct CA bundle " "set the %1% environment variable to the correct CA bundle "
"and restart the application."), "and restart the application."),