Updated some phrases

This commit is contained in:
Lukas Matena 2023-09-20 10:12:06 +02:00
parent efa2547a4f
commit 4694f2444e
8 changed files with 31 additions and 26 deletions

View File

@ -196,7 +196,7 @@ std::string get_error_string(const ThumbnailErrors& errors)
if (errors.has(ThumbnailError::OutOfRange)) if (errors.has(ThumbnailError::OutOfRange))
error_str += "\n - Input value is out of range"; error_str += "\n - Input value is out of range";
if (errors.has(ThumbnailError::InvalidExt)) if (errors.has(ThumbnailError::InvalidExt))
error_str += "\n - Some input extention is invalid"; error_str += "\n - Some extension in the input is invalid";
return error_str; return error_str;
} }

View File

@ -310,7 +310,7 @@ void PrintConfigDef::init_common_params()
def = this->add("thumbnails", coString); def = this->add("thumbnails", coString);
def->label = L("G-code thumbnails"); def->label = L("G-code thumbnails");
def->tooltip = L("Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the following format: \"XxY/EXT, XxY/EXT, ...\""); def->tooltip = L("Picture sizes to be stored into a .gcode / .bgcode and .sl1 / .sl1s files, in the following format: \"XxY/EXT, XxY/EXT, ...\"");
def->mode = comExpert; def->mode = comExpert;
def->gui_type = ConfigOptionDef::GUIType::one_string; def->gui_type = ConfigOptionDef::GUIType::one_string;
def->set_default_value(new ConfigOptionString()); def->set_default_value(new ConfigOptionString());
@ -429,8 +429,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("arc_fitting", coEnum); def = this->add("arc_fitting", coEnum);
def->label = L("Arc fitting"); def->label = L("Arc fitting");
def->tooltip = L("Enable this to get a G-code file which has G2 and G3 moves. " def->tooltip = L("Enable to get a G-code file which has G2 and G3 moves. "
"And the fitting tolerance is same with resolution"); "G-code resolution will be used as the fitting tolerance.");
def->set_enum<ArcFittingType>({ def->set_enum<ArcFittingType>({
{ "disabled", "Disabled" }, { "disabled", "Disabled" },
{ "emit_center", "Enabled: G2/3 I J" }, { "emit_center", "Enabled: G2/3 I J" },
@ -442,8 +442,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("arc_fitting_tolerance", coFloatOrPercent); def = this->add("arc_fitting_tolerance", coFloatOrPercent);
def->label = L("Arc fitting tolerance"); def->label = L("Arc fitting tolerance");
def->sidetext = L("mm or %"); def->sidetext = L("mm or %");
def->tooltip = L("When using the arc_fitting option, allow the curve to deviate a cetain % from the collection of strait paths.\n" def->tooltip = L("When using the arc_fitting option, allow the curve to deviate certain % from the collection of straight paths.\n"
"Can be a mm value or a percentage of the current extrusion width."); "Can be either a mm value or a percentage of the current extrusion width.");
def->mode = comAdvanced; def->mode = comAdvanced;
def->min = 0; def->min = 0;
def->set_default_value(new ConfigOptionFloatOrPercent(5, true)); def->set_default_value(new ConfigOptionFloatOrPercent(5, true));
@ -5103,6 +5103,7 @@ OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
def->tooltip = L("Zero-based index of the first extruder used in the print. Same as initial_tool."); def->tooltip = L("Zero-based index of the first extruder used in the print. Same as initial_tool.");
def = this->add("initial_filament_type", coString); def = this->add("initial_filament_type", coString);
// TRN: Meaning 'filament type of the initial filament'
def->label = L("Initial filament type"); def->label = L("Initial filament type");
def->tooltip = L("String containing filament type of the first used extruder."); def->tooltip = L("String containing filament type of the first used extruder.");
@ -5145,15 +5146,15 @@ PrintStatisticsConfigDef::PrintStatisticsConfigDef()
def = this->add("total_cost", coFloat); def = this->add("total_cost", coFloat);
def->label = L("Total cost"); def->label = L("Total cost");
def->tooltip = L("Total cost of all material used in the print. Calculated from filament_cost value in Filament Settings."); def->tooltip = L("Total cost of all material used in the print. Calculated from cost in Filament Settings.");
def = this->add("total_weight", coFloat); def = this->add("total_weight", coFloat);
def->label = L("Total weight"); def->label = L("Total weight");
def->tooltip = L("Total weight of the print. Calculated from filament_density value in Filament Settings."); def->tooltip = L("Total weight of the print. Calculated from density in Filament Settings.");
def = this->add("total_wipe_tower_cost", coFloat); def = this->add("total_wipe_tower_cost", coFloat);
def->label = L("Total wipe tower cost"); def->label = L("Total wipe tower cost");
def->tooltip = L("Total cost of the material wasted on the wipe tower. Calculated from filament_cost value in Filament Settings."); def->tooltip = L("Total cost of the material wasted on the wipe tower. Calculated from cost in Filament Settings.");
def = this->add("total_wipe_tower_filament", coFloat); def = this->add("total_wipe_tower_filament", coFloat);
def->label = L("Wipe tower volume"); def->label = L("Wipe tower volume");
@ -5164,7 +5165,7 @@ PrintStatisticsConfigDef::PrintStatisticsConfigDef()
def->tooltip = L("Total length of filament used in the print."); def->tooltip = L("Total length of filament used in the print.");
def = this->add("total_toolchanges", coInt); def = this->add("total_toolchanges", coInt);
def->label = L("Total toolchanges"); def->label = L("Total number of toolchanges");
def->tooltip = L("Number of toolchanges during the print."); def->tooltip = L("Number of toolchanges during the print.");
def = this->add("extruded_volume_total", coFloat); def = this->add("extruded_volume_total", coFloat);
@ -5173,11 +5174,11 @@ PrintStatisticsConfigDef::PrintStatisticsConfigDef()
def = this->add("extruded_weight", coFloats); def = this->add("extruded_weight", coFloats);
def->label = L("Weight per extruder"); def->label = L("Weight per extruder");
def->tooltip = L("Weight per extruder extruded during the entire print. Calculated from filament_density value in Filament Settings."); def->tooltip = L("Weight per extruder extruded during the entire print. Calculated from density in Filament Settings.");
def = this->add("extruded_weight_total", coFloat); def = this->add("extruded_weight_total", coFloat);
def->label = L("Total weight"); def->label = L("Total weight");
def->tooltip = L("Total weight of the print. Calculated from filament_density value in Filament Settings."); def->tooltip = L("Total weight of the print. Calculated from density in Filament Settings.");
def = this->add("total_layer_count", coInt); def = this->add("total_layer_count", coInt);
def->label = L("Total layer count"); def->label = L("Total layer count");

View File

@ -33,6 +33,7 @@ namespace GUI {
//------------------------------------------ //------------------------------------------
EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value) : EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value) :
// TRN: This is title of a dialog. The argument is the name of the currently edited custom G-code.
DPIDialog(parent, wxID_ANY, format_wxstr(_L("Edit Custom G-code (%1%)"), key), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) DPIDialog(parent, wxID_ANY, format_wxstr(_L("Edit Custom G-code (%1%)"), key), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{ {
SetFont(wxGetApp().normal_font()); SetFont(wxGetApp().normal_font());
@ -218,6 +219,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
// Add specific placeholders // Add specific placeholders
if (!specific_params.empty()) { if (!specific_params.empty()) {
// TRN: The argument is the name of currently edited custom gcode. The string starts a section of placeholders only available in this gcode.
wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "add_gcode"); wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "add_gcode");
for (const auto& opt_key : specific_params) for (const auto& opt_key : specific_params)
if (custom_gcode_specific_config_def.has(opt_key)) { if (custom_gcode_specific_config_def.has(opt_key)) {

View File

@ -391,7 +391,7 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
if (errors.has(ThumbnailError::InvalidExt)) { if (errors.has(ThumbnailError::InvalidExt)) {
if (!error_str.empty()) if (!error_str.empty())
error_str += "\n\n"; error_str += "\n\n";
error_str += _L("Some input extention is invalid"); error_str += _L("Some extension in the input is invalid");
} }
show_error(m_parent, error_str); show_error(m_parent, error_str);
} }

View File

@ -2562,6 +2562,7 @@ bool GLGizmoCut3D::render_angle_input(const std::string& label, float& in_val, c
m_is_slider_editing_done |= m_imgui->get_last_slider_status().deactivated_after_edit; m_is_slider_editing_done |= m_imgui->get_last_slider_status().deactivated_after_edit;
if (!is_approx(old_val, val)) { if (!is_approx(old_val, val)) {
if (m_imgui->get_last_slider_status().can_take_snapshot) { if (m_imgui->get_last_slider_status().can_take_snapshot) {
// TRN: This is an entry in the Undo/Redo stack. The whole line will be 'Edited: (name of whatever was edited)'.
Plater::TakeSnapshot snapshot(wxGetApp().plater(), format_wxstr("%1%: %2%", _L("Edited"), label), UndoRedo::SnapshotType::GizmoAction); Plater::TakeSnapshot snapshot(wxGetApp().plater(), format_wxstr("%1%: %2%", _L("Edited"), label), UndoRedo::SnapshotType::GizmoAction);
m_imgui->get_last_slider_status().invalidate_snapshot(); m_imgui->get_last_slider_status().invalidate_snapshot();
if (m_mode == size_t(CutMode::cutTongueAndGroove)) if (m_mode == size_t(CutMode::cutTongueAndGroove))

View File

@ -1666,10 +1666,10 @@ void MainFrame::init_menubar_as_gcodeviewer()
"", nullptr, [this]() { return !m_plater->get_last_loaded_gcode().empty(); }, this); "", nullptr, [this]() { return !m_plater->get_last_loaded_gcode().empty(); }, this);
#endif // __APPLE__ #endif // __APPLE__
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
append_menu_item(fileMenu, wxID_ANY, _L("Convert ascii G-code to &binary") + dots, _L("Convert a G-code file from ascii to binary format"), append_menu_item(fileMenu, wxID_ANY, _L("Convert ASCII G-code to &binary") + dots, _L("Convert a G-code file from ASCII to binary format"),
[this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_binary(); }, "convert_file", nullptr, [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_binary(); }, "convert_file", nullptr,
[]() { return true; }, this); []() { return true; }, this);
append_menu_item(fileMenu, wxID_ANY, _L("Convert binary G-code to &ascii") + dots, _L("Convert a G-code file from binary to ascii format"), append_menu_item(fileMenu, wxID_ANY, _L("Convert binary G-code to &ASCII") + dots, _L("Convert a G-code file from binary to ASCII format"),
[this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_ascii(); }, "convert_file", nullptr, [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->convert_gcode_to_ascii(); }, "convert_file", nullptr,
[]() { return true; }, this); []() { return true; }, this);
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();

View File

@ -2679,7 +2679,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
"Instead of considering them as multiple objects, should \n" "Instead of considering them as multiple objects, should \n"
"the file be loaded as a single object having multiple parts?") + "\n", "the file be loaded as a single object having multiple parts?") + "\n",
_L("Multi-part object detected"), wxICON_QUESTION | wxYES_NO); _L("Multi-part object detected"), wxICON_QUESTION | wxYES_NO);
dlg.ShowCheckBox(_L("Apply to all multiple objects being loaded.")); dlg.ShowCheckBox(_L("Apply to all objects being loaded."));
int answer = dlg.ShowModal(); int answer = dlg.ShowModal();
if (dlg.IsCheckBoxChecked()) if (dlg.IsCheckBoxChecked())
answer_consider_as_multi_part_objects = answer; answer_consider_as_multi_part_objects = answer;
@ -5509,7 +5509,7 @@ void Plater::convert_gcode_to_ascii()
using namespace bgcode::core; using namespace bgcode::core;
EResult res = bgcode::convert::from_binary_to_ascii(*in_file.f, *out_file.f, true); EResult res = bgcode::convert::from_binary_to_ascii(*in_file.f, *out_file.f, true);
if (res != EResult::Success) { if (res != EResult::Success) {
MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting gcode file"), wxICON_INFORMATION | wxOK); MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting G-code file"), wxICON_INFORMATION | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
out_file.close(); out_file.close();
boost::nowide::remove(output_file.c_str()); boost::nowide::remove(output_file.c_str());
@ -5517,7 +5517,8 @@ void Plater::convert_gcode_to_ascii()
} }
} }
MessageDialog msg_dlg(this, _L("Succesfully created gcode ascii file \n") + output_file, _L("Convert gcode file to ascii format"), wxICON_ERROR | wxOK); MessageDialog msg_dlg(this, Slic3r::GUI::format_wxstr("%1%\n%2%", _L("Successfully created G-code ASCII file"), output_file),
_L("Convert G-code file to ASCII format"), wxICON_ERROR | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
} }
@ -5561,7 +5562,7 @@ void Plater::convert_gcode_to_binary()
const bgcode::binarize::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config(); const bgcode::binarize::BinarizerConfig& binarizer_config = GCodeProcessor::get_binarizer_config();
EResult res = bgcode::convert::from_ascii_to_binary(*in_file.f, *out_file.f, binarizer_config); EResult res = bgcode::convert::from_ascii_to_binary(*in_file.f, *out_file.f, binarizer_config);
if (res != EResult::Success) { if (res != EResult::Success) {
MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting gcode file"), wxICON_INFORMATION | wxOK); MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting G-code file"), wxICON_INFORMATION | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
out_file.close(); out_file.close();
boost::nowide::remove(output_file.c_str()); boost::nowide::remove(output_file.c_str());
@ -5569,7 +5570,8 @@ void Plater::convert_gcode_to_binary()
} }
} }
MessageDialog msg_dlg(this, _L("Succesfully created gcode binary file \n") + output_file, _L("Convert gcode file to binary format"), wxICON_ERROR | wxOK); MessageDialog msg_dlg(this, Slic3r::GUI::format_wxstr("%1%\n%2%", _L("Successfully created G-code binary file"), output_file),
_L("Convert G-code file to binary format"), wxICON_ERROR | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
} }
@ -5806,6 +5808,7 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path)
// Decompress action. We already has correct file index in stat structure. // Decompress action. We already has correct file index in stat structure.
mz_bool res = mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0); mz_bool res = mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, (void*)buffer.data(), (size_t)stat.m_uncomp_size, 0);
if (res == 0) { if (res == 0) {
// TRN: First argument = path to file, second argument = error description
wxString error_log = GUI::format_wxstr(_L("Failed to unzip file to %1%: %2%"), final_path.string(), mz_zip_get_error_string(mz_zip_get_last_error(&archive))); wxString error_log = GUI::format_wxstr(_L("Failed to unzip file to %1%: %2%"), final_path.string(), mz_zip_get_error_string(mz_zip_get_last_error(&archive)));
BOOST_LOG_TRIVIAL(error) << error_log; BOOST_LOG_TRIVIAL(error) << error_log;
show_error(nullptr, error_log); show_error(nullptr, error_log);

View File

@ -2665,6 +2665,7 @@ void TabPrinter::build_fff()
auto [thumbnails_list, errors] = GCodeThumbnails::make_and_check_thumbnail_list(val); auto [thumbnails_list, errors] = GCodeThumbnails::make_and_check_thumbnail_list(val);
if (errors != enum_bitmask<ThumbnailError>()) { if (errors != enum_bitmask<ThumbnailError>()) {
// TRN: First argument is parameter name, the second one is the value.
std::string error_str = format(_u8L("Invalid value provided for parameter %1%: %2%"), "thumbnails", val); std::string error_str = format(_u8L("Invalid value provided for parameter %1%: %2%"), "thumbnails", val);
error_str += GCodeThumbnails::get_error_string(errors); error_str += GCodeThumbnails::get_error_string(errors);
InfoDialog(parent(), _L("G-code flavor is switched"), from_u8(error_str)).ShowModal(); InfoDialog(parent(), _L("G-code flavor is switched"), from_u8(error_str)).ShowModal();
@ -5004,11 +5005,8 @@ void Tab::fill_icon_descriptions()
"the last saved preset.")); "the last saved preset."));
m_icon_descriptions.emplace_back(&m_bmp_edit_value, L("EDIT VALUE"), m_icon_descriptions.emplace_back(&m_bmp_edit_value, L("EDIT VALUE"),
// TRN Description for "EDIT VALUE" // TRN Description for "EDIT VALUE" in the Help dialog (the icon is currently used only to edit custom gcodes).
L("indicates that the settings were changed and are not equal to the last saved preset for " L("clicking this icon opens a dialog allowing to edit this value."));
"the current option group.\n"
"Click the BACK ARROW icon to reset all settings for the current option group to "
"the last saved preset."));
} }
void Tab::set_tooltips_text() void Tab::set_tooltips_text()