From 0cfac53d24d9e5c5ee063d4cc988e342facc081f Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Thu, 9 May 2019 15:44:53 +0200
Subject: [PATCH] Some more localization fixes.
---
src/libslic3r/Print.cpp | 3 +--
src/libslic3r/PrintConfig.cpp | 2 +-
src/slic3r/GUI/BackgroundSlicingProcess.cpp | 2 --
src/slic3r/GUI/GUI_App.cpp | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 86dc37365..84837389e 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -1220,7 +1220,7 @@ std::string Print::validate() const
const SlicingParameters &slicing_params = object->slicing_parameters();
if (std::abs(slicing_params.first_print_layer_height - slicing_params0.first_print_layer_height) > EPSILON ||
std::abs(slicing_params.layer_height - slicing_params0.layer_height ) > EPSILON)
- return L("The Wipe Tower is only supported for multiple objects if they have equal layer heigths");
+ return L("The Wipe Tower is only supported for multiple objects if they have equal layer heights");
if (slicing_params.raft_layers() != slicing_params0.raft_layers())
return L("The Wipe Tower is only supported for multiple objects if they are printed over an equal number of raft layers");
if (object->config().support_material_contact_distance != m_objects.front()->config().support_material_contact_distance)
@@ -1515,7 +1515,6 @@ std::string Print::export_gcode(const std::string &path_template, GCodePreviewDa
// The following call may die if the output_filename_format template substitution fails.
std::string path = this->output_filepath(path_template);
std::string message;
- // #ys_FIXME_localization
if (! path.empty() && preview_data == nullptr) {
// Only show the path if preview_data is not set -> running from command line.
message = L("Exporting G-code");
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index f5190a96c..1dbd61bbb 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -2554,7 +2554,7 @@ void PrintConfigDef::init_sla_params()
def->tooltip = L("Defines the pad cavity depth. Set to zero to disable the cavity. "
"Be careful when enabling this feature, as some resins may "
"produce an extreme suction effect inside the cavity, "
- "which makes pealing the print off the vat foil difficult.");
+ "which makes peeling the print off the vat foil difficult.");
def->category = L("Pad");
// def->tooltip = L("");
def->sidetext = L("mm");
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
index 79705e24f..19ee0800b 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -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);
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index bd40e2016..a41e31767 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -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);