Fix GUI strings that should start with uppercase (#12499)
This commit is contained in:
committed by
GitHub
parent
2806398e79
commit
72a4597107
@@ -764,7 +764,7 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent)
|
||||
m_filament_from_panel = new wxPanel(parent);
|
||||
m_filament_from_panel->Hide();
|
||||
auto filament_from_sizer = new wxBoxSizer(wxVERTICAL);
|
||||
auto filament_from_text = new Label(m_filament_from_panel, _L("filament position"));
|
||||
auto filament_from_text = new Label(m_filament_from_panel, _L("Filament position"));
|
||||
filament_from_text->SetFont(Label::Head_14);
|
||||
filament_from_sizer->Add(filament_from_text, 0);
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ wxString Slic3r::get_stage_string(int stage)
|
||||
case 39:
|
||||
return _L("Nozzle offset calibration");
|
||||
case 40:
|
||||
return _L("high temperature auto bed leveling");
|
||||
return _L("High temperature auto bed leveling");
|
||||
case 41:
|
||||
return _L("Auto Check: Quick Release Lever");
|
||||
case 42:
|
||||
|
||||
@@ -76,7 +76,7 @@ DownloadProgressDialog::DownloadProgressDialog(wxString title)
|
||||
sizer_download_failed->Add(m_statictext_download_failed, 0, wxALIGN_CENTER | wxALL, 5);
|
||||
|
||||
// ORCA standardized HyperLink
|
||||
auto m_download_hyperlink = new HyperLink(m_panel_download_failed, _L("click here to see more info"), download_failed_url);
|
||||
auto m_download_hyperlink = new HyperLink(m_panel_download_failed, _L("Click here to see more info"), download_failed_url);
|
||||
sizer_download_failed->Add(m_download_hyperlink, 0, wxALIGN_CENTER | wxALL, 5);
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ DownloadProgressDialog::DownloadProgressDialog(wxString title)
|
||||
sizer_install_failed->Add(m_statictext_install_failed, 0, wxALIGN_CENTER | wxALL, 5);
|
||||
|
||||
// ORCA standardized HyperLink
|
||||
auto m_install_hyperlink = new HyperLink(m_panel_install_failed, _L("click here to see more info"), install_failed_url);
|
||||
auto m_install_hyperlink = new HyperLink(m_panel_install_failed, _L("Click here to see more info"), install_failed_url);
|
||||
sizer_install_failed->Add(m_install_hyperlink, 0, wxALIGN_CENTER | wxALL, 5);
|
||||
|
||||
|
||||
|
||||
@@ -3666,7 +3666,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
|
||||
append_headers({ {_u8L("Options"), offsets[0] }, { _u8L("Display"), offsets[1]} });
|
||||
const bool travel_visible = m_viewer.is_option_visible(libvgcode::EOptionType::Travels);
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 3.0f));
|
||||
append_item(EItemType::None, libvgcode::convert(m_viewer.get_option_color(libvgcode::EOptionType::Travels)), { {_u8L("travel"), offsets[0] }}, true, predictable_icon_pos/*ORCA checkbox_pos*/, travel_visible, [this, travel_visible]() {
|
||||
append_item(EItemType::None, libvgcode::convert(m_viewer.get_option_color(libvgcode::EOptionType::Travels)), { {_u8L("Travel"), offsets[0] }}, true, predictable_icon_pos/*ORCA checkbox_pos*/, travel_visible, [this, travel_visible]() {
|
||||
m_viewer.toggle_option_visibility(libvgcode::EOptionType::Travels);
|
||||
// refresh(*m_gcode_result, wxGetApp().plater()->get_extruder_colors_from_plater_config(m_gcode_result));
|
||||
update_moves_slider();
|
||||
@@ -3683,7 +3683,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
|
||||
append_headers({ {_u8L("Options"), offsets[0] }, { _u8L("Display"), offsets[1]} });
|
||||
const bool travel_visible = m_viewer.is_option_visible(libvgcode::EOptionType::Travels);
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0.0f, 3.0f));
|
||||
append_item(EItemType::None, libvgcode::convert(m_viewer.get_option_color(libvgcode::EOptionType::Travels)), { {_u8L("travel"), offsets[0] }}, true, predictable_icon_pos/*ORCA checkbox_pos*/, travel_visible, [this, travel_visible]() {
|
||||
append_item(EItemType::None, libvgcode::convert(m_viewer.get_option_color(libvgcode::EOptionType::Travels)), { {_u8L("Travel"), offsets[0] }}, true, predictable_icon_pos/*ORCA checkbox_pos*/, travel_visible, [this, travel_visible]() {
|
||||
m_viewer.toggle_option_visibility(libvgcode::EOptionType::Travels);
|
||||
// refresh(*m_gcode_result, wxGetApp().plater()->get_extruder_colors_from_plater_config(m_gcode_result));
|
||||
update_moves_slider();
|
||||
|
||||
@@ -1216,12 +1216,12 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed)
|
||||
m_selection.set_volumes(&m_volumes.volumes);
|
||||
|
||||
m_assembly_view_desc["object_selection_caption"] = _L("Left mouse button");
|
||||
m_assembly_view_desc["object_selection"] = _L("object selection");
|
||||
m_assembly_view_desc["object_selection"] = _L("Object selection");
|
||||
// FIXME: maybe should be using GUI::shortkey_alt_prefix() or equivalent?
|
||||
m_assembly_view_desc["part_selection_caption"] = _L("Alt+") + _L("Left mouse button");
|
||||
m_assembly_view_desc["part_selection"] = _L("part selection");
|
||||
m_assembly_view_desc["part_selection"] = _L("Part selection");
|
||||
m_assembly_view_desc["number_key_caption"] = "1~16 " + _L("number keys");
|
||||
m_assembly_view_desc["number_key"] = _L("number keys can quickly change the color of objects");
|
||||
m_assembly_view_desc["number_key"] = _L("Number keys can quickly change the color of objects");
|
||||
}
|
||||
|
||||
GLCanvas3D::~GLCanvas3D()
|
||||
@@ -8926,7 +8926,7 @@ void GLCanvas3D::_render_assemble_control()
|
||||
caption_max = std::max(caption_max, imgui->calc_text_size(m_assembly_view_desc.at(t + "_caption")).x);
|
||||
}
|
||||
const ImVec2 pos = ImGui::GetCursorScreenPos();
|
||||
const float text_y =imgui->calc_text_size(_L("part selection")).y;
|
||||
const float text_y = imgui->calc_text_size(_L("Part selection")).y;
|
||||
float get_cur_x = pos.x;
|
||||
float get_cur_y = pos.y - ImGui::GetFrameHeight() - 4 * text_y;
|
||||
tip_icon_size =_show_assembly_tooltip_information(caption_max, get_cur_x, get_cur_y);
|
||||
@@ -9647,7 +9647,7 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
|
||||
warning += std::to_string(filament + 1);
|
||||
warning += " ";
|
||||
}
|
||||
text = (boost::format(_u8L("filaments %s cannot be printed directly on the surface of this plate.")) % warning).str();
|
||||
text = (boost::format(_u8L("Filaments %s cannot be printed directly on the surface of this plate.")) % warning).str();
|
||||
error = ErrorType::SLICING_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1572,7 +1572,7 @@ void MenuFactory::create_plate_menu()
|
||||
{
|
||||
wxMenu* menu = &m_plate_menu;
|
||||
// select objects on current plate
|
||||
append_menu_item(menu, wxID_ANY, _L("Select All"), _L("select all objects on current plate"),
|
||||
append_menu_item(menu, wxID_ANY, _L("Select All"), _L("Select all objects on the current plate"),
|
||||
[](wxCommandEvent&) {
|
||||
plater()->select_curr_plate_all();
|
||||
}, "", nullptr, []() {
|
||||
@@ -1582,7 +1582,7 @@ void MenuFactory::create_plate_menu()
|
||||
}, m_parent);
|
||||
|
||||
// select objects on all plates
|
||||
append_menu_item(menu, wxID_ANY, _L("Select All Plates"), _L("select all objects on all plates"),
|
||||
append_menu_item(menu, wxID_ANY, _L("Select All Plates"), _L("Select all objects on all plates"),
|
||||
[](wxCommandEvent&) {
|
||||
plater()->select_all();
|
||||
}, "", nullptr, []() {
|
||||
@@ -1590,7 +1590,7 @@ void MenuFactory::create_plate_menu()
|
||||
}, m_parent);
|
||||
|
||||
// delete objects on current plate
|
||||
append_menu_item(menu, wxID_ANY, _L("Delete All"), _L("delete all objects on current plate"),
|
||||
append_menu_item(menu, wxID_ANY, _L("Delete All"), _L("Delete all objects on the current plate"),
|
||||
[](wxCommandEvent&) {
|
||||
plater()->remove_curr_plate_all();
|
||||
}, "", nullptr, []() {
|
||||
@@ -1600,7 +1600,7 @@ void MenuFactory::create_plate_menu()
|
||||
}, m_parent);
|
||||
|
||||
// arrange objects on current plate
|
||||
append_menu_item(menu, wxID_ANY, _L("Arrange"), _L("arrange current plate"),
|
||||
append_menu_item(menu, wxID_ANY, _L("Arrange"), _L("Arrange current plate"),
|
||||
[](wxCommandEvent&) {
|
||||
PartPlate* plate = plater()->get_partplate_list().get_selected_plate();
|
||||
assert(plate);
|
||||
@@ -1614,7 +1614,7 @@ void MenuFactory::create_plate_menu()
|
||||
|
||||
// reload all objects on current plate
|
||||
append_menu_item(
|
||||
menu, wxID_ANY, _L("Reload All"), _L("reload all from disk"),
|
||||
menu, wxID_ANY, _L("Reload All"), _L("Reload all from disk"),
|
||||
[](wxCommandEvent&) {
|
||||
PartPlate* plate = plater()->get_partplate_list().get_selected_plate();
|
||||
assert(plate);
|
||||
@@ -1624,7 +1624,7 @@ void MenuFactory::create_plate_menu()
|
||||
"", nullptr, []() { return !plater()->get_partplate_list().get_selected_plate()->get_objects().empty(); }, m_parent);
|
||||
|
||||
// orient objects on current plate
|
||||
append_menu_item(menu, wxID_ANY, _L("Auto Rotate"), _L("auto rotate current plate"),
|
||||
append_menu_item(menu, wxID_ANY, _L("Auto Rotate"), _L("Auto rotate current plate"),
|
||||
[](wxCommandEvent&) {
|
||||
PartPlate* plate = plater()->get_partplate_list().get_selected_plate();
|
||||
assert(plate);
|
||||
|
||||
@@ -1070,7 +1070,7 @@ void ObjectGrid::paste_data( wxTextDataObject& text_data )
|
||||
if ((src_row_cnt == 1) && (src_col_cnt == 1))
|
||||
{
|
||||
if ((dst_col_cnt != 1) || (dst_left_col != src_left_col)) {
|
||||
wxLogWarning(_L("one cell can only be copied to one or multiple cells in the same column"));
|
||||
wxLogWarning(_L("One cell can only be copied to one or more cells in the same column."));
|
||||
}
|
||||
else {
|
||||
split(buf, string_array);
|
||||
|
||||
@@ -668,7 +668,7 @@ void GLGizmoAdvancedCut::perform_cut(const Selection& selection)
|
||||
if (its_num_open_edges(new_objects[i]->volumes[j]->mesh().its) > 0) {
|
||||
if (!is_showed_dialog) {
|
||||
is_showed_dialog = true;
|
||||
MessageDialog dlg(nullptr, _L("non-manifold edges be caused by cut tool, do you want to fix it now?"), "", wxYES | wxNO);
|
||||
MessageDialog dlg(nullptr, _L("Non-manifold edges be caused by cut tool, do you want to fix it now?"), "", wxYES | wxNO);
|
||||
int ret = dlg.ShowModal();
|
||||
if (ret == wxID_YES) {
|
||||
user_fix_model = true;
|
||||
|
||||
@@ -3376,7 +3376,7 @@ void GLGizmoCut3D::perform_cut(const Selection& selection)
|
||||
if (its_num_open_edges(new_objects[i]->volumes[j]->mesh().its) > 0) {
|
||||
if (!is_showed_dialog) {
|
||||
is_showed_dialog = true;
|
||||
MessageDialog dlg(nullptr, _L("non-manifold edges be caused by cut tool, do you want to fix it now?"), "", wxYES | wxCANCEL);
|
||||
MessageDialog dlg(nullptr, _L("Non-manifold edges be caused by cut tool, do you want to fix it now?"), "", wxYES | wxCANCEL);
|
||||
int ret = dlg.ShowModal();
|
||||
if (ret == wxID_YES) {
|
||||
user_fix_model = true;
|
||||
|
||||
@@ -1332,7 +1332,7 @@ void GizmoObjectManipulation::do_render_scale_input_window(ImGuiWrapper* imgui_w
|
||||
is_avoid_one_update = true;
|
||||
}
|
||||
|
||||
auto uniform_scale_size =imgui_wrapper->calc_text_size(_L("uniform scale")).x;
|
||||
auto uniform_scale_size =imgui_wrapper->calc_text_size(_L("Uniform scale")).x;
|
||||
ImGui::PushItemWidth(uniform_scale_size);
|
||||
int size_sel{-1};
|
||||
if (!is_avoid_one_update) {
|
||||
@@ -1348,10 +1348,10 @@ void GizmoObjectManipulation::do_render_scale_input_window(ImGuiWrapper* imgui_w
|
||||
|
||||
//if (uniform_scale_only) {
|
||||
// imgui_wrapper->disabled_begin(true);
|
||||
// imgui_wrapper->bbl_checkbox(_L("uniform scale"), uniform_scale_only);
|
||||
// imgui_wrapper->bbl_checkbox(_L("Uniform scale"), uniform_scale_only);
|
||||
// imgui_wrapper->disabled_end();
|
||||
//} else {
|
||||
imgui_wrapper->bbl_checkbox(_L("uniform scale"), uniform_scale);
|
||||
imgui_wrapper->bbl_checkbox(_L("Uniform scale"), uniform_scale);
|
||||
//}
|
||||
if (uniform_scale != this->m_uniform_scale) { this->set_uniform_scaling(uniform_scale); }
|
||||
|
||||
|
||||
@@ -231,7 +231,7 @@ void KBShortcutsDialog::fill_shortcuts()
|
||||
{L("Arrow Right"), L("Move selection 10 mm in positive X direction")},
|
||||
{shift + L("Any arrow"), L("Movement step set to 1 mm")},
|
||||
{L("Esc"), L("Deselect all")},
|
||||
{"1-9", L("keyboard 1-9: set filament for object/part")},
|
||||
{"1-9", L("Keyboard 1-9: set filament for object/part")},
|
||||
{ctrl + "0", L("Camera view - Default")},
|
||||
{ctrl + "1", L("Camera view - Top")},
|
||||
{ctrl + "2", L("Camera view - Bottom")},
|
||||
|
||||
@@ -147,7 +147,7 @@ wxString DeviceItem::get_state_printable()
|
||||
str_state_printable.push_back(_L("Printing"));
|
||||
str_state_printable.push_back(_L("Upgrading"));
|
||||
str_state_printable.push_back(_L("Incompatible"));
|
||||
str_state_printable.push_back(_L("syncing"));
|
||||
str_state_printable.push_back(_L("Syncing"));
|
||||
|
||||
return str_state_printable[state_printable];
|
||||
}
|
||||
@@ -163,7 +163,7 @@ wxString DeviceItem::get_state_device()
|
||||
str_state_device.push_back(_L("Printing Pause"));
|
||||
str_state_device.push_back(_L("Prepare"));
|
||||
str_state_device.push_back(_L("Slicing"));
|
||||
str_state_device.push_back(_L("syncing"));
|
||||
str_state_device.push_back(_L("Syncing"));
|
||||
|
||||
return str_state_device[state_device];
|
||||
}
|
||||
|
||||
@@ -11948,7 +11948,7 @@ void Plater::import_model_id(wxString download_info)
|
||||
int res = 0;
|
||||
std::string http_body;
|
||||
|
||||
msg = _L("prepare 3MF file...");
|
||||
msg = _L("Preparing 3MF file...");
|
||||
|
||||
//gets the number of files with the same name
|
||||
std::vector<wxString> vecFiles;
|
||||
@@ -11997,7 +11997,7 @@ void Plater::import_model_id(wxString download_info)
|
||||
}
|
||||
|
||||
|
||||
msg = _L("downloading project...");
|
||||
msg = _L("Downloading project...");
|
||||
|
||||
//target_path = wxStandardPaths::Get().GetTempDir().utf8_str().data();
|
||||
|
||||
|
||||
@@ -1859,12 +1859,12 @@ wxBoxSizer* PreferencesDialog::create_debug_page()
|
||||
radio_group->SetSelection(3);
|
||||
}
|
||||
|
||||
Button* debug_button = new Button(m_parent, _L("debug save button"));
|
||||
Button* debug_button = new Button(m_parent, _L("Debug save button"));
|
||||
debug_button->SetStyle(ButtonStyle::Confirm, ButtonType::Window);
|
||||
|
||||
debug_button->Bind(wxEVT_LEFT_DOWN, [this, radio_group](wxMouseEvent &e) {
|
||||
// success message box
|
||||
MessageDialog dialog(this, _L("save debug settings"), _L("DEBUG settings have been saved successfully!"), wxNO_DEFAULT | wxYES_NO | wxICON_INFORMATION);
|
||||
MessageDialog dialog(this, _L("Save debug settings"), _L("DEBUG settings have been saved successfully!"), wxNO_DEFAULT | wxYES_NO | wxICON_INFORMATION);
|
||||
dialog.SetSize(400,-1);
|
||||
switch (dialog.ShowModal()) {
|
||||
case wxID_NO: {
|
||||
|
||||
@@ -607,7 +607,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
|
||||
auto completedimg = new wxStaticBitmap(m_panel_finish, wxID_ANY, create_scaled_bitmap("completed", m_panel_finish, 25), wxDefaultPosition, wxSize(imgsize, imgsize), 0);
|
||||
m_sizer_finish_h->Add(completedimg, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
|
||||
|
||||
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, L("send completed"), wxDefaultPosition, wxDefaultSize, 0);
|
||||
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, L("Send complete"), wxDefaultPosition, wxDefaultSize, 0);
|
||||
m_statictext_finish->Wrap(-1);
|
||||
m_statictext_finish->SetForegroundColour(wxColour(0, 150, 136));
|
||||
m_sizer_finish_h->Add(m_statictext_finish, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
|
||||
|
||||
@@ -367,7 +367,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater)
|
||||
auto completedimg = new wxStaticBitmap(m_panel_finish, wxID_ANY, create_scaled_bitmap("completed", m_panel_finish, 25), wxDefaultPosition, wxSize(imgsize, imgsize), 0);
|
||||
m_sizer_finish_h->Add(completedimg, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
|
||||
|
||||
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, L("send completed"), wxDefaultPosition, wxDefaultSize, 0);
|
||||
m_statictext_finish = new wxStaticText(m_panel_finish, wxID_ANY, L("Send complete"), wxDefaultPosition, wxDefaultSize, 0);
|
||||
m_statictext_finish->Wrap(-1);
|
||||
m_statictext_finish->SetForegroundColour(wxColour(0, 150, 136));
|
||||
m_sizer_finish_h->Add(m_statictext_finish, 0, wxALIGN_CENTER | wxALL, FromDIP(5));
|
||||
|
||||
@@ -5891,7 +5891,7 @@ wxBoxSizer *ScoreDialog::get_button_sizer()
|
||||
if (ret == -1)
|
||||
error_info += _L("Upload failed\n").ToUTF8().data();
|
||||
else
|
||||
error_info += _L("obtaining instance_id failed\n").ToUTF8().data();
|
||||
error_info += _L("Obtaining instance_id failed\n").ToUTF8().data();
|
||||
if (!error_info.empty()) { BOOST_LOG_TRIVIAL(info) << error_info; }
|
||||
|
||||
dlg_info = new MessageDialog(this,
|
||||
|
||||
Reference in New Issue
Block a user