3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-24 17:21:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
YuSanka 2019-05-09 15:53:55 +02:00
commit 7d032382b4
4 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View file

@ -102,7 +102,6 @@ void BackgroundSlicingProcess::process_sla()
if (! m_export_path.empty()) {
const std::string export_path = m_sla_print->print_statistics().finalize_output_path(m_export_path);
m_sla_print->export_raster(export_path);
// #ys_FIXME_localization
m_print->set_status(100, (boost::format(_(L("Masked SLA file exported to %1%")).ToUTF8().data()) % export_path).str());
} else if (! m_upload_job.empty()) {
prepare_upload();
@ -407,7 +406,6 @@ void BackgroundSlicingProcess::prepare_upload()
m_sla_print->export_raster(source_path.string(), m_upload_job.upload_data.upload_path.string());
}
// #ys_FIXME_localization
m_print->set_status(100, (boost::format(_(L("Scheduling upload to `%1%`. See Window -> Print Host Upload Queue")).ToUTF8().data()) % m_upload_job.printhost->get_host()).str());
m_upload_job.upload_data.source_path = std::move(source_path);

2
src/slic3r/GUI/GUI_App.cpp
View file

@ -750,7 +750,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
*/
wxMessageDialog dialog(nullptr,
_(L("Switching the language will trigger application restart.\n"
"You will lose all your unsaved data (content of the plater, modified presets).")) + "\n\n" +
"You will lose content of the plater.")) + "\n\n" +
_(L("Do you want to proceed?")),
wxString(SLIC3R_APP_NAME) + " - " + _(L("Language selection")),
wxICON_QUESTION | wxOK | wxCANCEL);