3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from Prusa-Development/ys_beta26_local

Browse source 
Merged/fixed dictionaries provided by contributors
This commit is contained in:
Oleksandra Yushchenko 2023-05-22 12:36:06 +02:00 • committed by GitHub
commit bb1e5dbb7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 68592 additions and 30497 deletions
src/slic3r/GUI
GUI_ObjectList.cpp

4
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -1801,7 +1801,7 @@ void ObjectList::load_shape_object(const std::string& type_name)
// Create mesh
BoundingBoxf3 bb;
TriangleMesh mesh = create_mesh(type_name, bb);
load_mesh_object(mesh, _u8L("Shape") + "-" + type_name);
load_mesh_object(mesh, _u8L("Shape") + "-" + into_u8(_(type_name)));
if (!m_objects->empty())
m_objects->back()->volumes.front()->source.is_from_builtin_objects = true;
wxGetApp().mainframe->update_title();
@ -2070,7 +2070,7 @@ bool ObjectList::del_from_cut_object(bool is_cut_connector, bool is_model_part/*
InfoDialog dialog(wxGetApp().plater(), title,
_L("This action will break a cut information.\n"
"After that PrusaSlicer can't guarantee model consistency.") + "\n\n" +
_L("To manipulate with solid parts or negative volumes you have to invalidate cut information first." + msg_end ),
_L("To manipulate with solid parts or negative volumes you have to invalidate cut information first.") + msg_end,
false, buttons_style | wxCANCEL_DEFAULT | wxICON_WARNING);
dialog.SetButtonLabel(wxID_YES, _L("Invalidate cut info"));