diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 3a9573ccf..9fec898fe 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1075,16 +1075,16 @@ void PrintConfigDef::init_fff_params() // Add the machine feedrate limits for XYZE axes. (M203) def = this->add("machine_max_feedrate_" + axis.name, coFloats); def->full_label = (boost::format("Maximum feedrate %1%") % axis_upper).str(); - L("Maximum feedrate x"); - L("Maximum feedrate y"); - L("Maximum feedrate z"); - L("Maximum feedrate e"); + L("Maximum feedrate X"); + L("Maximum feedrate Y"); + L("Maximum feedrate Z"); + L("Maximum feedrate E"); def->category = L("Machine limits"); def->tooltip = (boost::format("Maximum feedrate of the %1% axis") % axis_upper).str(); - L("Maximum feedrate of the x axis"); - L("Maximum feedrate of the y axis"); - L("Maximum feedrate of the z axis"); - L("Maximum feedrate of the e axis"); + L("Maximum feedrate of the X axis"); + L("Maximum feedrate of the Y axis"); + L("Maximum feedrate of the Z axis"); + L("Maximum feedrate of the E axis"); def->sidetext = L("mm/s"); def->min = 0; def->width = machine_limits_opt_width; @@ -1093,12 +1093,16 @@ void PrintConfigDef::init_fff_params() // Add the machine acceleration limits for XYZE axes (M201) def = this->add("machine_max_acceleration_" + axis.name, coFloats); def->full_label = (boost::format("Maximum acceleration %1%") % axis_upper).str(); - L("Maximum acceleration x"); - L("Maximum acceleration y"); - L("Maximum acceleration z"); - L("Maximum acceleration e"); + L("Maximum acceleration X"); + L("Maximum acceleration Y"); + L("Maximum acceleration Z"); + L("Maximum acceleration E"); def->category = L("Machine limits"); def->tooltip = (boost::format("Maximum acceleration of the %1% axis") % axis_upper).str(); + L("Maximum acceleration of the X axis"); + L("Maximum acceleration of the Y axis"); + L("Maximum acceleration of the Z axis"); + L("Maximum acceleration of the E axis"); def->sidetext = L("mm/s²"); def->min = 0; def->width = machine_limits_opt_width; @@ -1107,16 +1111,16 @@ void PrintConfigDef::init_fff_params() // Add the machine jerk limits for XYZE axes (M205) def = this->add("machine_max_jerk_" + axis.name, coFloats); def->full_label = (boost::format("Maximum jerk %1%") % axis_upper).str(); - L("Maximum jerk x"); - L("Maximum jerk y"); - L("Maximum jerk z"); - L("Maximum jerk e"); + L("Maximum jerk X"); + L("Maximum jerk Y"); + L("Maximum jerk Z"); + L("Maximum jerk E"); def->category = L("Machine limits"); def->tooltip = (boost::format("Maximum jerk of the %1% axis") % axis_upper).str(); - L("Maximum jerk of the x axis"); - L("Maximum jerk of the y axis"); - L("Maximum jerk of the z axis"); - L("Maximum jerk of the e axis"); + L("Maximum jerk of the X axis"); + L("Maximum jerk of the Y axis"); + L("Maximum jerk of the Z axis"); + L("Maximum jerk of the E axis"); def->sidetext = L("mm/s"); def->min = 0; def->width = machine_limits_opt_width; diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 4f1c024eb..a8a2b7e92 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -1020,7 +1020,7 @@ void StaticText::BUILD() if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit); const wxString legend(m_opt.get_default_value()->value); - auto temp = new wxStaticText(m_parent, wxID_ANY, legend, wxDefaultPosition, size, wxST_ELLIPSIZE_MIDDLE); + auto temp = new wxStaticText(m_parent, wxID_ANY, _(legend.ToStdString()), wxDefaultPosition, size, wxST_ELLIPSIZE_MIDDLE); temp->SetFont(Slic3r::GUI::wxGetApp().normal_font()); temp->SetBackgroundStyle(wxBG_STYLE_PAINT); temp->SetFont(wxGetApp().bold_font()); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index c6043e802..d7e6d398c 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2125,7 +2125,7 @@ void TabPrinter::extruders_count_changed(size_t extruders_count) void TabPrinter::append_option_line(ConfigOptionsGroupShp optgroup, const std::string opt_key) { auto option = optgroup->get_option(opt_key, 0); - auto line = Line{ option.opt.full_label, "" }; + auto line = Line{ _(option.opt.full_label), "" }; line.append_option(option); if (m_use_silent_mode) line.append_option(optgroup->get_option(opt_key, 1));