From 867a5c982c2a068d9c166b2a7200913554d08d02 Mon Sep 17 00:00:00 2001 From: Arthur Date: Mon, 24 Oct 2022 09:35:09 +0800 Subject: [PATCH] ENH: modify some words to simplify translation Some sentenses are only slightly different which is unnecessary. Making them the same can save a translation and also keep consistency. Change-Id: Ie59c0bf788a31ee0c6a0d792af7b3d532fe34f75 (cherry picked from commit eb69195569518e3be61e5a8887ea317fbe3e7302) --- src/libslic3r/Print.cpp | 2 +- src/slic3r/GUI/MainFrame.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 2 +- src/slic3r/GUI/Tab.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index c38ec166c..0e273e793 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -443,7 +443,7 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print single_object_exception.object = instance.model_instance->get_object(); } else { - single_object_exception.string += (boost::format(L("\n%1% is too close to exclusion area, there may be collisions when printing.")) %instance.model_instance->get_object()->name).str(); + single_object_exception.string += "\n"+(boost::format(L("%1% is too close to exclusion area, there may be collisions when printing.")) %instance.model_instance->get_object()->name).str(); single_object_exception.object = nullptr; } //if (polygons) { diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 57d1474f0..37c3c02e3 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -2336,7 +2336,7 @@ void MainFrame::init_menubar_as_gcodeviewer() append_menu_item(fileMenu, wxID_ANY, _L("Export &Toolpaths as OBJ") + dots, _L("Export toolpaths as OBJ"), [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->export_toolpaths_to_obj(); }, "export_plater", nullptr, [this]() {return can_export_toolpaths(); }, this); - append_menu_item(fileMenu, wxID_ANY, _L("Open &PrusaSlicer") + dots, _L("Open PrusaSlicer"), + append_menu_item(fileMenu, wxID_ANY, _L("Open &Studio") + dots, _L("Open Studio"), [](wxCommandEvent&) { start_new_slicer(); }, "", nullptr, []() {return true; }, this); fileMenu->AppendSeparator(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index ff2e8b49a..629279a04 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -4234,7 +4234,7 @@ void Plater::priv::export_gcode(fs::path output_path, bool output_path_on_remova return; if (background_process.is_export_scheduled()) { - GUI::show_error(q, _L("Another export job is currently running.")); + GUI::show_error(q, _L("Another export job is running.")); return; } diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 93dec7a7e..83c5a7f4f 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1700,7 +1700,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vectoroption>("timelapse_type"); bool timelapse_enabled = timelapse_type->value == TimelapseType::tlSmooth; if (!boost::any_cast(value) && timelapse_enabled) { - MessageDialog dlg(wxGetApp().plater(), _L("Prime tower is required by smooth timeplase. If whthout prime tower, there will be flaws on the model. Are you sure you want to disable prime tower?"), + MessageDialog dlg(wxGetApp().plater(), _L("Prime tower is required for smooth timeplase. If whthout prime tower, there will be flaws on the model. Are you sure you want to disable prime tower?"), _L("Warning"), wxICON_WARNING | wxYES | wxNO); if (dlg.ShowModal() == wxID_NO) { DynamicPrintConfig new_conf = *m_config; @@ -1396,7 +1396,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value) if (opt_key == "timelapse_type") { bool wipe_tower_enabled = m_config->option("enable_prime_tower")->value; if (!wipe_tower_enabled && boost::any_cast(value) == int(TimelapseType::tlSmooth)) { - MessageDialog dlg(wxGetApp().plater(), _L("Prime tower is required by smooth timelapse. If whthout prime tower, there will be flaws on the model. Do you want to enable prime tower?"), + MessageDialog dlg(wxGetApp().plater(), _L("Prime tower is required for smooth timelapse. There may be flaws on the model without prime tower. Do you want to enable prime tower?"), _L("Warning"), wxICON_WARNING | wxYES | wxNO); if (dlg.ShowModal() == wxID_YES) { DynamicPrintConfig new_conf = *m_config;