Fixes in phrases

This commit is contained in:
Lukas Matena 2024-02-13 11:01:32 +01:00
parent 3ed43609f5
commit a20fb3bfdd
4 changed files with 19 additions and 15 deletions

View File

@ -5104,7 +5104,7 @@ CLIMiscConfigDef::CLIMiscConfigDef()
def = this->add("threads", coInt); def = this->add("threads", coInt);
def->label = L("Maximum number of threads"); def->label = L("Maximum number of threads");
def->tooltip = L("Sets the maximum number of threads the slicing process will use. If not defined, slic3r will decide."); def->tooltip = L("Sets the maximum number of threads the slicing process will use. If not defined, it will be decided automatically.");
def->min = 1; def->min = 1;
def = this->add("loglevel", coInt); def = this->add("loglevel", coInt);
@ -5440,6 +5440,7 @@ CustomGcodeSpecificConfigDef::CustomGcodeSpecificConfigDef()
def->tooltip = L("Height above the print bed when the toolchange takes place. Usually the same as layer_z, but can be different."); def->tooltip = L("Height above the print bed when the toolchange takes place. Usually the same as layer_z, but can be different.");
def = this->add("color_change_extruder", coInt); def = this->add("color_change_extruder", coInt);
// TRN: This is a label in custom g-code editor dialog, belonging to color_change_extruder. Denoted index of the extruder for which color change is performed.
def->label = L("Color change extruder"); def->label = L("Color change extruder");
def->tooltip = L("Index of the extruder for which color change will be performed. The index is zero based (first extruder has index 0)."); def->tooltip = L("Index of the extruder for which color change will be performed. The index is zero based (first extruder has index 0).");
} }

View File

@ -670,18 +670,18 @@ std::string SLAPrint::validate(std::vector<std::string>*) const
double head_width = m_full_print_config.opt_float(prefix + "support_head_width"); double head_width = m_full_print_config.opt_float(prefix + "support_head_width");
if (head_penetration > head_width) { if (head_penetration > head_width) {
return _u8L("Invalid Head penetration") + "\n" + return _u8L("Invalid Head penetration\n"
_u8L("Head penetration should not be greater than the head width.") + "\n" + "Head penetration should not be greater than the Head width.\n"
_u8L("Please check value of head penetration in print settings or material overrides."); "Please check value of Head penetration in Print Settings or Material Overrides.");
} }
double pinhead_d = m_full_print_config.opt_float(prefix + "support_head_front_diameter"); double pinhead_d = m_full_print_config.opt_float(prefix + "support_head_front_diameter");
double pillar_d = m_full_print_config.opt_float(prefix + "support_pillar_diameter"); double pillar_d = m_full_print_config.opt_float(prefix + "support_pillar_diameter");
if (pinhead_d > pillar_d) { if (pinhead_d > pillar_d) {
return _u8L("Invalid pinhead diameter") + "\n" + return _u8L("Invalid pinhead diameter\n"
_u8L("Pinhead front diameter should be smaller than the pillar diameter.") + "Pinhead front diameter should be smaller than the Pillar diameter.\n"
_u8L("Please check value of pinhead front diameter in print settings or material overrides."); "Please check value of Pinhead front diameter in Print Settings or Material Overrides.");
} }
} }

View File

@ -3295,10 +3295,9 @@ static void check_objects_after_cut(const ModelObjectPtrs& objects)
} }
if (is_windows10() && !err_objects_idxs.empty()) { if (is_windows10() && !err_objects_idxs.empty()) {
auto dlg = WarningDialog(plater, _L("Cut is performed and open eages or auto-repaired errors are detected in result objects.\n" auto dlg = WarningDialog(plater, _L("Open edges or auto-repaired errors were detected after the cut.\n"
"You can fix them by Windows repair algorithm.\n\n" "Do you want to fix them by Windows repair algorithm?"),
"Do you want to fix cut objects?"), _L("Errors detected after cut operation"), wxYES_NO);
_L("Detected errors in cut objects"), wxYES_NO);
if (dlg.ShowModal() == wxID_YES) { if (dlg.ShowModal() == wxID_YES) {
// model_name // model_name
std::vector<std::string> succes_models; std::vector<std::string> succes_models;
@ -3316,11 +3315,12 @@ static void check_objects_after_cut(const ModelObjectPtrs& objects)
std::vector<std::pair<std::string, std::string>>& failed_models) -> bool std::vector<std::pair<std::string, std::string>>& failed_models) -> bool
{ {
const std::string& model_name = model_names[model_idx]; const std::string& model_name = model_names[model_idx];
wxString msg = _L("Repairing model"); wxString msg;
if (model_names.size() == 1) if (model_names.size() == 1)
msg += ": " + from_u8(model_name) + "\n"; msg = GUI::format(_L("Repairing object %1%"), model_name) + "\n";
else { else {
msg += ":\n"; // TRN: This is followed by a list of object which are to be repaired.
msg = _L("Repairing objects:") + "\n";
for (int i = 0; i < int(model_names.size()); ++i) for (int i = 0; i < int(model_names.size()); ++i)
msg += (i == model_idx ? " > " : " ") + from_u8(model_names[i]) + "\n"; msg += (i == model_idx ? " > " : " ") + from_u8(model_names[i]) + "\n";
msg += "\n"; msg += "\n";
@ -3338,6 +3338,7 @@ static void check_objects_after_cut(const ModelObjectPtrs& objects)
}; };
// Open a progress dialog. // Open a progress dialog.
// TRN: This shows in a progress dialog while the operation is in progress.
wxProgressDialog progress_dlg(_L("Fixing by Windows repair algorithm"), "", 100, find_toplevel_parent(plater), wxProgressDialog progress_dlg(_L("Fixing by Windows repair algorithm"), "", 100, find_toplevel_parent(plater),
wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT); wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT);
int model_idx{ 0 }; int model_idx{ 0 };
@ -3352,7 +3353,8 @@ static void check_objects_after_cut(const ModelObjectPtrs& objects)
// Show info dialog // Show info dialog
wxString msg = MenuFactory::get_repaire_result_message(succes_models, failed_models); wxString msg = MenuFactory::get_repaire_result_message(succes_models, failed_models);
InfoDialog(plater, _L("Repairing result"), msg).ShowModal(); // TRN: Title of a dialog informing the user about the result of the model repair operation.
InfoDialog(plater, _L("Repair operation finished"), msg).ShowModal();
} }
} }
} }

View File

@ -5562,6 +5562,7 @@ std::vector<std::pair<std::string, std::vector<std::string>>> material_overrides
void TabSLAMaterial::add_material_overrides_page() void TabSLAMaterial::add_material_overrides_page()
{ {
// TRN: Page title in Material Settings in SLA mode.
PageShp page = add_options_page(L("Material Overrides"), "wrench"); PageShp page = add_options_page(L("Material Overrides"), "wrench");
for (const auto& [title, keys] : material_overrides_option_keys) { for (const auto& [title, keys] : material_overrides_option_keys) {