diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 5795a9f64..7318153ef 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -1914,8 +1914,8 @@ bool Control::check_ticks_changed_event(const std::string& gcode) { wxString message = m_mode == t_mode::SingleExtruder ? ( _(L("The last color change data was saved for a multi extruder printing.")) + "\n\n" + - _(L("Select YES if you want to delete all saved tool changes, \n\t" - "NO if you want all tool changes switch to color changes, \n\t" + _(L("Select YES if you want to delete all saved tool changes, \n" + "NO if you want all tool changes switch to color changes, \n" "or CANCEL to leave it unchanged.")) + "\n\n\t" + _(L("Do you want to delete all saved tool changes?")) ) : ( // t_mode::MultiExtruder diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index a57225954..d434ac2d0 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1188,7 +1188,7 @@ void Sidebar::update_sliced_info_sizer() if (p->plater->printer_technology() == ptSLA) { const SLAPrintStatistics& ps = p->plater->sla_print().print_statistics(); - wxString new_label = _(L("Used Material (ml)")) + " :"; + wxString new_label = _(L("Used Material (ml)")) + ":"; const bool is_supports = ps.support_used_material > 0.0; if (is_supports) new_label += from_u8((boost::format("\n - %s\n - %s") % _utf8(L("object(s)")) % _utf8(L("supports and pad"))).str()); @@ -1213,7 +1213,7 @@ void Sidebar::update_sliced_info_sizer() p->sliced_info->SetTextAndShow(siCost, str_total_cost, "Cost"); wxString t_est = std::isnan(ps.estimated_print_time) ? "N/A" : get_time_dhms(float(ps.estimated_print_time)); - p->sliced_info->SetTextAndShow(siEstimatedTime, t_est, _(L("Estimated printing time")) + " :"); + p->sliced_info->SetTextAndShow(siEstimatedTime, t_est, _(L("Estimated printing time")) + ":"); // Hide non-SLA sliced info parameters p->sliced_info->SetTextAndShow(siFilament_m, "N/A"); @@ -1228,7 +1228,7 @@ void Sidebar::update_sliced_info_sizer() wxString new_label = _(L("Used Filament (m)")); if (is_wipe_tower) - new_label += from_u8((boost::format(" :\n - %1%\n - %2%") % _utf8(L("objects")) % _utf8(L("wipe tower"))).str()); + new_label += from_u8((boost::format(":\n - %1%\n - %2%") % _utf8(L("objects")) % _utf8(L("wipe tower"))).str()); wxString info_text = is_wipe_tower ? wxString::Format("%.2f \n%.2f \n%.2f", ps.total_used_filament / 1000, @@ -1242,7 +1242,7 @@ void Sidebar::update_sliced_info_sizer() new_label = _(L("Cost")); if (is_wipe_tower) - new_label += from_u8((boost::format(" :\n - %1%\n - %2%") % _utf8(L("objects")) % _utf8(L("wipe tower"))).str()); + new_label += from_u8((boost::format(":\n - %1%\n - %2%") % _utf8(L("objects")) % _utf8(L("wipe tower"))).str()); info_text = ps.total_cost == 0.0 ? "N/A" : is_wipe_tower ? @@ -1255,7 +1255,7 @@ void Sidebar::update_sliced_info_sizer() if (ps.estimated_normal_print_time == "N/A" && ps.estimated_silent_print_time == "N/A") p->sliced_info->SetTextAndShow(siEstimatedTime, "N/A"); else { - new_label = _(L("Estimated printing time")) +" :"; + new_label = _(L("Estimated printing time")) +":"; info_text = ""; wxString str_color = _(L("Color")); wxString str_pause = _(L("Pause")); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 1033ffac4..c8022432c 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -956,8 +956,7 @@ void Tab::update_preset_description_line() } else if (parent == nullptr) { description_line = _(L("Current preset is inherited from the default preset.")); } else { - description_line = from_u8((boost::format( - _utf8(L("Current preset is inherited from:\n\t%s"))) % parent->name).str()); + description_line = _(L("Current preset is inherited from")) + ":\n\t" + parent->name; } if (preset.is_default || preset.is_system) @@ -1709,7 +1708,7 @@ void TabPrinter::build_printhost(ConfigOptionsGroup *optgroup) option.opt.width = Field::def_width_wider(); optgroup->append_single_option_line(option); - const auto ca_file_hint = _(L("HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate.")); + const auto ca_file_hint = _utf8(L("HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate.")); if (Http::ca_file_supported()) { option = optgroup->get_option("printhost_cafile"); @@ -1751,15 +1750,19 @@ void TabPrinter::build_printhost(ConfigOptionsGroup *optgroup) Line line { "", "" }; line.full_width = 1; - line.widget = [this, ca_file_hint] (wxWindow* parent) { - auto txt = new wxStaticText(parent, wxID_ANY, from_u8((boost::format("%1%\n\n\t%2%") - % (boost::format(_utf8(L("HTTPS CA File:\n\ + line.widget = [ca_file_hint] (wxWindow* parent) { + std::string info = _utf8(L("HTTPS CA File")) + ":\n\t" + + (boost::format(_utf8(L("On this system, %s uses HTTPS certificates from the system Certificate Store or Keychain."))) % SLIC3R_APP_NAME).str() + + "\n\t" + _utf8(L("To use a custom CA file, please import your CA file into Certificate Store / Keychain.")); + + auto txt = new wxStaticText(parent, wxID_ANY, from_u8((boost::format("%1%\n\n\t%2%") % info % ca_file_hint).str())); +/* % (boost::format(_utf8(L("HTTPS CA File:\n\ \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n\ \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."))) % SLIC3R_APP_NAME).str() % std::string(ca_file_hint.ToUTF8())).str())); - txt->SetFont(Slic3r::GUI::wxGetApp().normal_font()); +*/ txt->SetFont(Slic3r::GUI::wxGetApp().normal_font()); auto sizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(txt); + sizer->Add(txt, 1, wxEXPAND); return sizer; }; @@ -3261,8 +3264,8 @@ void Tab::fill_icon_descriptions() m_icon_descriptions.emplace_back(&m_bmp_white_bullet, L("WHITE BULLET"), // TRN Description for "WHITE BULLET" - L("for the left button: \tindicates a non-system (or non-default) preset,\n" - "for the right button: \tindicates that the settings hasn't been modified.")); + L("for the left button: indicates a non-system (or non-default) preset,\n" + "for the right button: indicates that the settings hasn't been modified.")); m_icon_descriptions.emplace_back(&m_bmp_value_revert, L("BACK ARROW"), // TRN Description for "BACK ARROW"