Some fixes in phrases

This commit is contained in:
Lukas Matena 2024-12-04 16:12:22 +01:00
parent 56cb063c3b
commit 229d425dd3
6 changed files with 22 additions and 15 deletions

View File

@ -538,8 +538,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("automatic_infill_combination", coBool); def = this->add("automatic_infill_combination", coBool);
def->label = L("Automatic infill combination"); def->label = L("Automatic infill combination");
def->category = L("Infill"); def->category = L("Infill");
def->tooltip = L("This feature automatically combine infill of several layers and speeds up your print by extruding thicker " def->tooltip = L("This feature automatically combines infill of several layers and speeds up your print by extruding thicker "
"infill layers while preserving thin perimeters, thus accuracy."); "infill layers while preserving thin perimeters, thus maintaining accuracy.");
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false)); def->set_default_value(new ConfigOptionBool(false));
@ -1011,6 +1011,7 @@ void PrintConfigDef::init_fff_params()
"(top+bottom solid layers)."); "(top+bottom solid layers).");
def->set_enum<EnsureVerticalShellThickness>({ def->set_enum<EnsureVerticalShellThickness>({
{ "disabled", L("Disabled") }, { "disabled", L("Disabled") },
// TRN: This is a drop-down option for 'Ensure vertical shell thickness' parameter.
{ "partial", L("Partial") }, { "partial", L("Partial") },
{ "enabled", L("Enabled") }, { "enabled", L("Enabled") },
}); });
@ -2731,7 +2732,9 @@ void PrintConfigDef::init_fff_params()
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<ScarfSeamPlacement>(ScarfSeamPlacement::nowhere)); def->set_default_value(new ConfigOptionEnum<ScarfSeamPlacement>(ScarfSeamPlacement::nowhere));
def->set_enum<ScarfSeamPlacement>({ def->set_enum<ScarfSeamPlacement>({
// TRN: Drop-down option for 'Scarf joint placement' parameter.
{ "nowhere", L("Nowhere") }, { "nowhere", L("Nowhere") },
// TRN: Drop-down option for 'Scarf joint placement' parameter.
{ "contours", L("Contours") }, { "contours", L("Contours") },
{ "everywhere", L("Everywhere") } { "everywhere", L("Everywhere") }
}); });
@ -2747,7 +2750,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Scarf start height"); def->label = L("Scarf start height");
def->category = L("Layers and Perimeters"); def->category = L("Layers and Perimeters");
def->tooltip = L("Start height of the scarf joint specified as fraction of the current layer height."); def->tooltip = L("Start height of the scarf joint specified as fraction of the current layer height.");
def->sidetext = L(" %"); def->sidetext = L("%");
def->min = 0; def->min = 0;
def->max = 100; def->max = 100;
def->mode = comAdvanced; def->mode = comAdvanced;
@ -2772,7 +2775,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("scarf_seam_max_segment_length", coFloat); def = this->add("scarf_seam_max_segment_length", coFloat);
def->label = L("Max scarf joint segment length"); def->label = L("Max scarf joint segment length");
def->category = L("Layers and Perimeters"); def->category = L("Layers and Perimeters");
def->tooltip = L("Maximal length of any scarf joint segment."); def->tooltip = L("Maximum length of any scarf joint segment.");
def->sidetext = L("mm"); def->sidetext = L("mm");
def->min = 0.15f; def->min = 0.15f;
def->mode = comAdvanced; def->mode = comAdvanced;

View File

@ -204,7 +204,7 @@ BulkExportDialog::BulkExportDialog(const std::vector<std::pair<int, std::optiona
DPIDialog( DPIDialog(
nullptr, nullptr,
wxID_ANY, wxID_ANY,
paths.size() == 1 ? _L("Export bed") : _L("Export beds"), _L("Export beds"),
wxDefaultPosition, wxDefaultPosition,
wxSize(45 * wxGetApp().em_unit(), 5 * wxGetApp().em_unit()), wxSize(45 * wxGetApp().em_unit(), 5 * wxGetApp().em_unit()),
wxDEFAULT_DIALOG_STYLE | wxICON_WARNING wxDEFAULT_DIALOG_STYLE | wxICON_WARNING
@ -253,8 +253,8 @@ void BulkExportDialog::accept()
{ {
if (has_warnings()) { if (has_warnings()) {
MessageDialog dialog(nullptr, MessageDialog dialog(nullptr,
_L("Some of the selected files already exists. Do you want to replace them?"), _L("Some of the selected files already exist. Do you want to replace them?"),
_L("Export Beds"), wxYES_NO | wxICON_QUESTION); _L("Export beds"), wxYES_NO | wxICON_QUESTION);
if (dialog.ShowModal() == wxID_NO) if (dialog.ShowModal() == wxID_NO)
return; return;
} }

View File

@ -2089,7 +2089,7 @@ void render_print_statistics(float scale) {
void render_autoslicing_wait() { void render_autoslicing_wait() {
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(20.f,30.f)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(20.f,30.f));
begin_statistics(_u8L("Waiting for statistics").c_str()); begin_statistics((_u8L("Generating statistics") + " ...").c_str());
ImGui::Text("%s", _u8L("Statistics will be available once all beds are sliced").c_str()); ImGui::Text("%s", _u8L("Statistics will be available once all beds are sliced").c_str());
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::End(); ImGui::End();
@ -6612,12 +6612,12 @@ void GLCanvas3D::_render_overlays()
std::string get_status_text(PrintStatus status) { std::string get_status_text(PrintStatus status) {
switch(status) { switch(status) {
case PrintStatus::idle: return _u8L("Unsliced"); case PrintStatus::idle: return _u8L("Unsliced bed");
case PrintStatus::running: return _u8L("Slicing") + "..."; case PrintStatus::running: return _u8L("Slicing") + "...";
case PrintStatus::finished: return _u8L("Sliced"); case PrintStatus::finished: return _u8L("Sliced bed");
case PrintStatus::outside: return _u8L("Object at boundary"); case PrintStatus::outside: return _u8L("Object at boundary");
case PrintStatus::invalid: return _u8L("Invalid data"); case PrintStatus::invalid: return _u8L("Invalid data");
case PrintStatus::empty: return _u8L("Empty"); case PrintStatus::empty: return _u8L("Empty bed");
case PrintStatus::toolpath_outside: return _u8L("Toolpath exceeds bounds"); case PrintStatus::toolpath_outside: return _u8L("Toolpath exceeds bounds");
} }
return {}; return {};

View File

@ -3333,8 +3333,8 @@ void GUI_App::open_web_page_localized(const std::string &http_address)
open_browser_with_warning_dialog(from_u8(http_address + "&lng=") + this->current_language_code_safe(), nullptr, false); open_browser_with_warning_dialog(from_u8(http_address + "&lng=") + this->current_language_code_safe(), nullptr, false);
} }
// If we are switching from the FFF-preset to the SLA, we should to control the printed objects if they have a part(s). // If we are switching from the FFF-preset to the SLA, we should to control the printed objects if they have modifiers.
// Because of we can't to print the multi-part objects with SLA technology. // Modifiers are not supported in SLA mode.
bool GUI_App::may_switch_to_SLA_preset(const wxString& caption) bool GUI_App::may_switch_to_SLA_preset(const wxString& caption)
{ {
if (model_has_parameter_modifiers_in_objects(model())) { if (model_has_parameter_modifiers_in_objects(model())) {

View File

@ -2143,7 +2143,7 @@ void Plater::priv::process_validation_warning(const std::vector<std::string>& wa
if (text == "_SUPPORTS_OFF") { if (text == "_SUPPORTS_OFF") {
text = _u8L("An object has custom support enforcers which will not be used " text = _u8L("An object has custom support enforcers which will not be used "
"because supports are disabled.")+"\n"; "because supports are disabled.")+"\n";
hypertext = _u8L("Enable supports for enforcers only"); hypertext = _u8L("Enable supports for enforcers only.");
action_fn = [](wxEvtHandler*) { action_fn = [](wxEvtHandler*) {
Tab* print_tab = wxGetApp().get_tab(Preset::TYPE_PRINT); Tab* print_tab = wxGetApp().get_tab(Preset::TYPE_PRINT);
assert(print_tab); assert(print_tab);
@ -2166,8 +2166,12 @@ void Plater::priv::process_validation_warning(const std::vector<std::string>& wa
"is experimental, so proceed with caution."); "is experimental, so proceed with caution.");
notification_type = NotificationType::WipeTowerNozzleDiameterDiffer; notification_type = NotificationType::WipeTowerNozzleDiameterDiffer;
} else if (text == "_SUPPORT_NOZZLE_DIAMETER_DIFFER") { } else if (text == "_SUPPORT_NOZZLE_DIAMETER_DIFFER") {
// TRN: This is a first part of the notification text:
// "Printing supports with different nozzle diameters is experimental. For best results, switch to Organic supports and assign a specific extruder for supports."
text = _u8L("Printing supports with different nozzle diameters " text = _u8L("Printing supports with different nozzle diameters "
"is experimental. For best results, switch to Organic supports and"); "is experimental. For best results, switch to Organic supports and");
// TRN: This is a second part (hyperlink) of the notification text:
// "Printing supports with different nozzle diameters is experimental. For best results, switch to Organic supports and assign a specific extruder for supports."
hypertext = _u8L("assign a specific extruder for supports."); hypertext = _u8L("assign a specific extruder for supports.");
multiline = true; multiline = true;
notification_type = NotificationType::SupportNozzleDiameterDiffer; notification_type = NotificationType::SupportNozzleDiameterDiffer;

View File

@ -286,7 +286,7 @@ CommonUpdaterDialog::CommonUpdaterDialog(PresetUpdaterUIStatus* ui_status, wxWin
, PresetUpdaterUIStatusCancel(ui_status) , PresetUpdaterUIStatusCancel(ui_status)
{ {
auto* headline = new wxStaticText(this, wxID_ANY, first_line, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); auto* headline = new wxStaticText(this, wxID_ANY, first_line, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
m_status_text = new wxStaticText(this, wxID_ANY, _L("Initializing..."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); m_status_text = new wxStaticText(this, wxID_ANY, _L("Initializing") + dots, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
m_cancel_button = new wxButton(this, wxID_CANCEL, "Cancel"); m_cancel_button = new wxButton(this, wxID_CANCEL, "Cancel");
// Layout using sizer // Layout using sizer
wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL);