mirror of
https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git
synced 2025-06-03 02:44:28 +08:00
Fix english strings consistency (#8881)
* "non zero" -> "non-zero" * "Z hop" -> "Z-hop" * "works" -> "is working" * "version at least x" -> "version x or higher" * "printing job" -> "print job" "to print on" -> "printing on" * "is not find" -> "was not found" * "boundary of plate" -> "plate boundaries" * "toolchange" -> "tool change" * "colour" -> "color" * "cancelled" -> "canceled" * "can not" -> "cannot" * "gcode" -> "G-code"
This commit is contained in:
Alexandre Folle de Menezes
GitHub
parent
e787666605
commit
d37f1b6a81
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -158,7 +158,7 @@ text = Different types of supports\nDid you know that you can choose from multip
|
||||
text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results.
|
||||
|
||||
[hint:Brim for better adhesion]
|
||||
text = Brim for better adhesion\nDid you know that when printing models have a small contact interface with the printing surface, it's recommended to use a brim?
|
||||
text = Brim for better adhesion\nDid you know that when printed models have a small contact interface with the printing surface, it's recommended to use a brim?
|
||||
|
||||
[hint:Set parameters for multiple objects]
|
||||
text = Set parameters for multiple objects\nDid you know that you can set slicing parameters for all selected objects at one time?
|
||||
|
||||
@ -59,7 +59,7 @@ static inline FlowRole opt_key_to_flow_role(const std::string &opt_key)
|
||||
|
||||
static inline void throw_on_missing_variable(const std::string &opt_key, const char *dependent_opt_key)
|
||||
{
|
||||
throw FlowErrorMissingVariable((boost::format(L("Failed to calculate line width of %1%. Can not get value of \"%2%\" ")) % opt_key % dependent_opt_key).str());
|
||||
throw FlowErrorMissingVariable((boost::format(L("Failed to calculate line width of %1%. Cannot get value of \"%2%\" ")) % opt_key % dependent_opt_key).str());
|
||||
}
|
||||
|
||||
// Used to provide hints to the user on default extrusion width values, and to provide reasonable values to the PlaceholderParser.
|
||||
|
||||
@ -2740,7 +2740,7 @@ void GCode::check_placeholder_parser_failed()
|
||||
{
|
||||
if (! m_placeholder_parser_integration.failed_templates.empty()) {
|
||||
// G-code export proceeded, but some of the PlaceholderParser substitutions failed.
|
||||
std::string msg = Slic3r::format(_(L("Failed to generate gcode for invalid custom G-code.\n\n")));
|
||||
std::string msg = Slic3r::format(_(L("Failed to generate G-code for invalid custom G-code.\n\n")));
|
||||
for (const auto &name_and_error : m_placeholder_parser_integration.failed_templates)
|
||||
msg += name_and_error.first + " " + name_and_error.second + "\n";
|
||||
msg += Slic3r::format(_(L("Please check the custom G-code or use the default custom G-code.")));
|
||||
|
||||
@ -51,7 +51,7 @@ AdaptivePAInterpolator* AdaptivePAProcessor::getInterpolator(unsigned int tool_i
|
||||
if (it != m_AdaptivePAInterpolators.end()) {
|
||||
return it->second.get();
|
||||
}
|
||||
return nullptr; // Handle the case where the tool_id is not found
|
||||
return nullptr; // Handle the case where the tool_id was not found
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -2540,7 +2540,7 @@ const std::string& PresetCollection::get_suffix_modified() {
|
||||
}
|
||||
|
||||
// Return a preset by its name. If the preset is active, a temporary copy is returned.
|
||||
// If a preset is not found by its name, null is returned.
|
||||
// If a preset was not found by its name, null is returned.
|
||||
Preset* PresetCollection::find_preset(const std::string &name, bool first_visible_if_not_found, bool real, bool only_from_library)
|
||||
{
|
||||
Preset key(m_type, name, false);
|
||||
|
||||
@ -1051,7 +1051,7 @@ StringObjectException Print::check_multi_filament_valid(const Print& print)
|
||||
filament_types.push_back(print_config.filament_type.get_at(extruder_idx));
|
||||
|
||||
if (!check_multi_filaments_compatibility(filament_types))
|
||||
return { L("Can not print multiple filaments which have large difference of temperature together. Otherwise, the extruder and nozzle may be blocked or damaged during printing") };
|
||||
return { L("Cannot print multiple filaments which have large difference of temperature together. Otherwise, the extruder and nozzle may be blocked or damaged during printing") };
|
||||
|
||||
return {std::string()};
|
||||
}
|
||||
@ -1942,7 +1942,7 @@ void Print::process(long long *time_cost_with_cache, bool use_cache)
|
||||
}
|
||||
if (!found_shared) {
|
||||
BOOST_LOG_TRIVIAL(warning) << boost::format("Also can not find the shared object, identify_id %1%, maybe shared object is skipped")%obj->model_object()->instances[0]->loaded_id;
|
||||
//throw Slic3r::SlicingError("Can not find the cached data.");
|
||||
//throw Slic3r::SlicingError("Cannot find the cached data.");
|
||||
//don't report errot, set use_cache to false, and reslice these objects
|
||||
need_slicing_objects.insert(obj);
|
||||
re_slicing_objects.insert(obj);
|
||||
|
||||
@ -681,20 +681,20 @@ void PrintConfigDef::init_fff_params()
|
||||
def->set_default_value(new ConfigOptionFloatOrPercent(0., false));
|
||||
|
||||
// BBS
|
||||
def = this->add("supertack_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"Value 0 means the filament does not support to print on the Cool Plate");
|
||||
def->sidetext = "°C";
|
||||
def = this->add("supertack_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"A value of 0 means the filament does not support printing on the Cool Plate SuperTack.");
|
||||
def->sidetext = "°C";
|
||||
def->full_label = L("Bed temperature");
|
||||
def->min = 0;
|
||||
def->max = 120;
|
||||
def->min = 0;
|
||||
def->max = 120;
|
||||
def->set_default_value(new ConfigOptionInts{35});
|
||||
|
||||
def = this->add("cool_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"Value 0 means the filament does not support to print on the Cool Plate");
|
||||
"A value of 0 means the filament does not support printing on the Cool Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->full_label = L("Bed temperature");
|
||||
def->min = 0;
|
||||
@ -704,7 +704,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("textured_cool_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"Value 0 means the filament does not support to print on the Textured Cool Plate");
|
||||
"A value of 0 means the filament does not support printing on the Textured Cool Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->full_label = L("Bed temperature");
|
||||
def->min = 0;
|
||||
@ -714,7 +714,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("eng_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"Value 0 means the filament does not support to print on the Engineering Plate");
|
||||
"A value of 0 means the filament does not support printing on the Engineering Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->full_label = L("Bed temperature");
|
||||
def->min = 0;
|
||||
@ -724,28 +724,28 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("hot_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"Value 0 means the filament does not support to print on the High Temp Plate");
|
||||
"A value of 0 means the filament does not support printing on the High Temp Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->full_label = L("Bed temperature");
|
||||
def->min = 0;
|
||||
def->max = 300;
|
||||
def->set_default_value(new ConfigOptionInts{ 45 });
|
||||
|
||||
def = this->add("textured_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"Value 0 means the filament does not support to print on the Textured PEI Plate");
|
||||
def->sidetext = L("°C");
|
||||
def = this->add("textured_plate_temp", coInts);
|
||||
def->label = L("Other layers");
|
||||
def->tooltip = L("Bed temperature for layers except the initial one. "
|
||||
"A value of 0 means the filament does not support printing on the Textured PEI Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->full_label = L("Bed temperature");
|
||||
def->min = 0;
|
||||
def->max = 300;
|
||||
def->min = 0;
|
||||
def->max = 300;
|
||||
def->set_default_value(new ConfigOptionInts{45});
|
||||
|
||||
def = this->add("supertack_plate_temp_initial_layer", coInts);
|
||||
def->label = L("Initial layer");
|
||||
def->full_label = L("Initial layer bed temperature");
|
||||
def->tooltip = L("Bed temperature of the initial layer. "
|
||||
"Value 0 means the filament does not support to print on the Cool Plate SuperTack");
|
||||
"A value of 0 means the filament does not support printing on the Cool Plate SuperTack.");
|
||||
def->sidetext = "°C";
|
||||
def->min = 0;
|
||||
def->max = 120;
|
||||
@ -755,7 +755,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Initial layer");
|
||||
def->full_label = L("Initial layer bed temperature");
|
||||
def->tooltip = L("Bed temperature of the initial layer. "
|
||||
"Value 0 means the filament does not support to print on the Cool Plate");
|
||||
"A value of 0 means the filament does not support printing on the Cool Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->min = 0;
|
||||
def->max = 120;
|
||||
@ -765,7 +765,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Initial layer");
|
||||
def->full_label = L("Initial layer bed temperature");
|
||||
def->tooltip = L("Bed temperature of the initial layer. "
|
||||
"Value 0 means the filament does not support to print on the Textured Cool Plate");
|
||||
"A value of 0 means the filament does not support printing on the Textured Cool Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->min = 0;
|
||||
def->max = 120;
|
||||
@ -775,7 +775,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Initial layer");
|
||||
def->full_label = L("Initial layer bed temperature");
|
||||
def->tooltip = L("Bed temperature of the initial layer. "
|
||||
"Value 0 means the filament does not support to print on the Engineering Plate");
|
||||
"A value of 0 means the filament does not support printing on the Engineering Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->min = 0;
|
||||
def->max = 300;
|
||||
@ -785,19 +785,19 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Initial layer");
|
||||
def->full_label = L("Initial layer bed temperature");
|
||||
def->tooltip = L("Bed temperature of the initial layer. "
|
||||
"Value 0 means the filament does not support to print on the High Temp Plate");
|
||||
"A value of 0 means the filament does not support printing on the High Temp Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->max = 300;
|
||||
def->set_default_value(new ConfigOptionInts{ 45 });
|
||||
|
||||
def = this->add("textured_plate_temp_initial_layer", coInts);
|
||||
def->label = L("Initial layer");
|
||||
def = this->add("textured_plate_temp_initial_layer", coInts);
|
||||
def->label = L("Initial layer");
|
||||
def->full_label = L("Initial layer bed temperature");
|
||||
def->tooltip = L("Bed temperature of the initial layer. "
|
||||
"Value 0 means the filament does not support to print on the Textured PEI Plate");
|
||||
def->sidetext = L("°C");
|
||||
def->min = 0;
|
||||
def->max = 300;
|
||||
def->tooltip = L("Bed temperature of the initial layer. "
|
||||
"A value of 0 means the filament does not support printing on the Textured PEI Plate.");
|
||||
def->sidetext = L("°C");
|
||||
def->min = 0;
|
||||
def->max = 300;
|
||||
def->set_default_value(new ConfigOptionInts{45});
|
||||
|
||||
def = this->add("curr_bed_type", coEnum);
|
||||
@ -1429,7 +1429,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("during_print_exhaust_fan_speed", coInts);
|
||||
def->label = L("Fan speed");
|
||||
def->tooltip=L("Speed of exhaust fan during printing.This speed will overwrite the speed in filament custom gcode");
|
||||
def->tooltip=L("Speed of exhaust fan during printing. This speed will override the speed in filament custom G-code.");
|
||||
def->sidetext = L("%");
|
||||
def->min=0;
|
||||
def->max=100;
|
||||
@ -1459,7 +1459,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Don't support bridges");
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("Don't support the whole bridge area which make support very large. "
|
||||
"Bridge usually can be printing directly without support if not very long");
|
||||
"Bridges can usually be printed directly without support if not very long.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
@ -1547,7 +1547,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("machine_end_gcode", coString);
|
||||
def->label = L("End G-code");
|
||||
def->tooltip = L("End G-code when finish the whole printing");
|
||||
def->tooltip = L("End G-code when finishing the entire print.");
|
||||
def->multiline = true;
|
||||
def->full_width = true;
|
||||
def->height = 12;
|
||||
@ -1555,8 +1555,8 @@ void PrintConfigDef::init_fff_params()
|
||||
def->set_default_value(new ConfigOptionString("M104 S0 ; turn off temperature\nG28 X0 ; home X axis\nM84 ; disable motors\n"));
|
||||
|
||||
def = this->add("printing_by_object_gcode", coString);
|
||||
def->label = L("Between Object Gcode");
|
||||
def->tooltip = L("Insert Gcode between objects. This parameter will only come into effect when you print your models object by object");
|
||||
def->label = L("Between Object G-code");
|
||||
def->tooltip = L("Insert G-code between objects. This parameter will only come into effect when you print your models object by object.");
|
||||
def->multiline = true;
|
||||
def->full_width = true;
|
||||
def->height = 12;
|
||||
@ -1820,20 +1820,20 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("filament_flow_ratio", coFloats);
|
||||
def->label = L("Flow ratio");
|
||||
def->tooltip = L("The material may have volumetric change after switching between molten state and crystalline state. "
|
||||
"This setting changes all extrusion flow of this filament in gcode proportionally. "
|
||||
"Recommended value range is between 0.95 and 1.05. "
|
||||
"Maybe you can tune this value to get nice flat surface when there has slight overflow or underflow");
|
||||
def->tooltip = L("The material may have volumetric change after switching between molten and crystalline states. "
|
||||
"This setting changes all extrusion flow of this filament in G-code proportionally. "
|
||||
"The recommended value range is between 0.95 and 1.05. "
|
||||
"You may be able to tune this value to get a nice flat surface if there is slight overflow or underflow.");
|
||||
def->max = 2;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloats { 1. });
|
||||
|
||||
def = this->add("print_flow_ratio", coFloat);
|
||||
def->label = L("Flow ratio");
|
||||
def->tooltip = L("The material may have volumetric change after switching between molten state and crystalline state. "
|
||||
"This setting changes all extrusion flow of this filament in gcode proportionally. "
|
||||
"Recommended value range is between 0.95 and 1.05. "
|
||||
"Maybe you can tune this value to get nice flat surface when there has slight overflow or underflow. "
|
||||
def->tooltip = L("The material may have volumetric change after switching between molten and crystalline states. "
|
||||
"This setting changes all extrusion flow of this filament in G-code proportionally. "
|
||||
"The recommended value range is between 0.95 and 1.05. "
|
||||
"You may be able to tune this value to get a nice flat surface if there is slight overflow or underflow."
|
||||
"\n\nThe final object flow ratio is this value multiplied by the filament flow ratio.");
|
||||
def->mode = comAdvanced;
|
||||
def->max = 2;
|
||||
@ -2016,7 +2016,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("filament_diameter", coFloats);
|
||||
def->label = L("Diameter");
|
||||
def->tooltip = L("Filament diameter is used to calculate extrusion in gcode, so it's important and should be accurate");
|
||||
def->tooltip = L("Filament diameter is used to calculate extrusion in G-code, so it is important and should be accurate.");
|
||||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->set_default_value(new ConfigOptionFloats { 1.75 });
|
||||
@ -2113,7 +2113,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("filament_toolchange_delay", coFloats);
|
||||
def->label = L("Delay after unloading");
|
||||
def->tooltip = L("Time to wait after the filament is unloaded. "
|
||||
"May help to get reliable toolchanges with flexible materials "
|
||||
"May help to get reliable tool changes with flexible materials "
|
||||
"that may need more time to shrink to original dimensions.");
|
||||
def->sidetext = L("s");
|
||||
def->min = 0;
|
||||
@ -2138,7 +2138,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("filament_stamping_distance", coFloats);
|
||||
def->label = L("Stamping distance measured from the center of the cooling tube");
|
||||
def->tooltip = L("If set to nonzero value, filament is moved toward the nozzle between the individual cooling moves (\"stamping\"). "
|
||||
def->tooltip = L("If set to non-zero value, filament is moved toward the nozzle between the individual cooling moves (\"stamping\"). "
|
||||
"This option configures how long this movement should be before the filament is retracted again.");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
@ -2181,14 +2181,14 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("filament_multitool_ramming", coBools);
|
||||
def->label = L("Enable ramming for multi-tool setups");
|
||||
def->tooltip = L("Perform ramming when using multi-tool printer (i.e. when the 'Single Extruder Multimaterial' in Printer Settings is unchecked). "
|
||||
"When checked, a small amount of filament is rapidly extruded on the wipe tower just before the toolchange. "
|
||||
"When checked, a small amount of filament is rapidly extruded on the wipe tower just before the tool change. "
|
||||
"This option is only used when the wipe tower is enabled.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBools { false });
|
||||
|
||||
def = this->add("filament_multitool_ramming_volume", coFloats);
|
||||
def->label = L("Multi-tool ramming volume");
|
||||
def->tooltip = L("The volume to be rammed before the toolchange.");
|
||||
def->tooltip = L("The volume to be rammed before the tool change.");
|
||||
def->sidetext = L("mm³");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
@ -2196,7 +2196,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("filament_multitool_ramming_flow", coFloats);
|
||||
def->label = L("Multi-tool ramming flow");
|
||||
def->tooltip = L("Flow used for ramming the filament before the toolchange.");
|
||||
def->tooltip = L("Flow used for ramming the filament before the tool change.");
|
||||
def->sidetext = L("mm³/s");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
@ -2677,7 +2677,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("nozzle_temperature_initial_layer", coInts);
|
||||
def->label = L("Initial layer");
|
||||
def->full_label = L("Initial layer nozzle temperature");
|
||||
def->tooltip = L("Nozzle temperature to print initial layer when using this filament");
|
||||
def->tooltip = L("Nozzle temperature for printing initial layer when using this filament");
|
||||
def->sidetext = L("°C");
|
||||
def->min = 0;
|
||||
def->max = max_temp;
|
||||
@ -2855,7 +2855,7 @@ void PrintConfigDef::init_fff_params()
|
||||
// BBS
|
||||
def = this->add("gcode_add_line_number", coBool);
|
||||
def->label = L("Add line number");
|
||||
def->tooltip = L("Enable this to add line number(Nx) at the beginning of each G-Code line");
|
||||
def->tooltip = L("Enable this to add line number(Nx) at the beginning of each G-code line.");
|
||||
def->mode = comDevelop;
|
||||
def->set_default_value(new ConfigOptionBool(0));
|
||||
|
||||
@ -2929,15 +2929,14 @@ void PrintConfigDef::init_fff_params()
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
|
||||
def = this->add("fan_speedup_time", coFloat);
|
||||
// Label is set in Tab.cpp in the Line object.
|
||||
//def->label = L("Fan speed-up time");
|
||||
def->tooltip = L("Start the fan this number of seconds earlier than its target start time (you can use fractional seconds)."
|
||||
" It assumes infinite acceleration for this time estimation, and will only take into account G1 and G0 moves (arc fitting"
|
||||
" is unsupported)."
|
||||
"\nIt won't move fan commands from custom gcodes (they act as a sort of 'barrier')."
|
||||
"\nIt won't move fan commands into the start gcode if the 'only custom start gcode' is activated."
|
||||
"\nIt won't move fan commands from custom G-code (they act as a sort of 'barrier')."
|
||||
"\nIt won't move fan commands into the start G-code if the 'only custom start G-code' is activated."
|
||||
"\nUse 0 to deactivate.");
|
||||
def->sidetext = L("s");
|
||||
def->mode = comAdvanced;
|
||||
@ -2985,7 +2984,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("gcode_flavor", coEnum);
|
||||
def->label = L("G-code flavor");
|
||||
def->tooltip = L("What kind of gcode the printer is compatible with");
|
||||
def->tooltip = L("What kind of G-code the printer is compatible with.");
|
||||
def->enum_keys_map = &ConfigOptionEnum<GCodeFlavor>::get_enum_values();
|
||||
def->enum_values.push_back("marlin");
|
||||
def->enum_values.push_back("klipper");
|
||||
@ -3030,7 +3029,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("gcode_label_objects", coBool);
|
||||
def->label = L("Label objects");
|
||||
def->tooltip = L("Enable this to add comments into the G-Code labeling print moves with what object they belong to,"
|
||||
def->tooltip = L("Enable this to add comments into the G-code labeling print moves with what object they belong to,"
|
||||
" which is useful for the Octoprint CancelObject plugin. This settings is NOT compatible with "
|
||||
"Single Extruder Multi Material setup and Wipe into Object / Wipe into Infill.");
|
||||
def->mode = comAdvanced;
|
||||
@ -3038,7 +3037,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("exclude_object", coBool);
|
||||
def->label = L("Exclude objects");
|
||||
def->tooltip = L("Enable this option to add EXCLUDE OBJECT command in g-code");
|
||||
def->tooltip = L("Enable this option to add EXCLUDE OBJECT command in G-code.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
@ -3302,7 +3301,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("layer_change_gcode", coString);
|
||||
def->label = L("Layer change G-code");
|
||||
def->tooltip = L("This gcode part is inserted at every layer change after lift z");
|
||||
def->tooltip = L("This G-code is inserted at every layer change after the Z lift.");
|
||||
def->multiline = true;
|
||||
def->full_width = true;
|
||||
def->height = 5;
|
||||
@ -3326,14 +3325,14 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("emit_machine_limits_to_gcode", coBool);
|
||||
def->label = L("Emit limits to G-code");
|
||||
def->category = L("Machine limits");
|
||||
def->tooltip = L("If enabled, the machine limits will be emitted to G-code file.\nThis option will be ignored if the g-code flavor is "
|
||||
def->tooltip = L("If enabled, the machine limits will be emitted to G-code file.\nThis option will be ignored if the G-code flavor is "
|
||||
"set to Klipper.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(true));
|
||||
|
||||
def = this->add("machine_pause_gcode", coString);
|
||||
def->label = L("Pause G-code");
|
||||
def->tooltip = L("This G-code will be used as a code for the pause print. User can insert pause G-code in gcode viewer");
|
||||
def->tooltip = L("This G-code will be used as a code for the pause print. Users can insert pause G-code in the G-code viewer.");
|
||||
def->multiline = true;
|
||||
def->full_width = true;
|
||||
def->height = 12;
|
||||
@ -3550,13 +3549,13 @@ void PrintConfigDef::init_fff_params()
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(0));
|
||||
|
||||
|
||||
def = this->add("max_volumetric_extrusion_rate_slope_segment_length", coFloat);
|
||||
def->label = L("Smoothing segment length");
|
||||
def->tooltip = L("A lower value results in smoother extrusion rate transitions. However, this results in a significantly larger gcode file "
|
||||
"and more instructions for the printer to process. \n\n"
|
||||
"Default value of 3 works well for most cases. If your printer is stuttering, increase this value to reduce the number of adjustments made\n\n"
|
||||
"Allowed values: 0.5-5");
|
||||
def->tooltip = L("A lower value results in smoother extrusion rate transitions. "
|
||||
"However, this results in a significantly larger G-code file and more instructions for the printer to process.\n\n"
|
||||
"Default value of 3 works well for most cases. If your printer is stuttering, increase this value to reduce the number of adjustments made.\n\n"
|
||||
"Allowed values: 0.5-5");
|
||||
def->min = 0.5;
|
||||
def->max = 5;
|
||||
def->sidetext = L("mm");
|
||||
@ -3912,7 +3911,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Raft layers");
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("Object will be raised by this number of support layers. "
|
||||
"Use this function to avoid wrapping when print ABS");
|
||||
"Use this function to avoid warping when printing ABS.");
|
||||
def->sidetext = L("layers");
|
||||
def->min = 0;
|
||||
def->max = 100;
|
||||
@ -3921,8 +3920,8 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("resolution", coFloat);
|
||||
def->label = L("Resolution");
|
||||
def->tooltip = L("G-code path is generated after simplifying the contour of model to avoid too much points and gcode lines "
|
||||
"in gcode file. Smaller value means higher resolution and more time to slice");
|
||||
def->tooltip = L("The G-code path is generated after simplifying the contour of models to avoid too many points and G-code lines. "
|
||||
"Smaller value means higher resolution and more time to slice.");
|
||||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
@ -4005,16 +4004,16 @@ void PrintConfigDef::init_fff_params()
|
||||
def->set_default_value(new ConfigOptionFloats { 0.4 });
|
||||
|
||||
def = this->add("retract_lift_above", coFloats);
|
||||
def->label = L("Z hop lower boundary");
|
||||
def->tooltip = L("Z hop will only come into effect when Z is above this value and is below the parameter: \"Z hop upper boundary\"");
|
||||
def->label = L("Z-hop lower boundary");
|
||||
def->tooltip = L("Z-hop will only come into effect when Z is above this value and is below the parameter: \"Z-hop upper boundary\".");
|
||||
def->sidetext = L("mm");
|
||||
def->mode = comAdvanced;
|
||||
def->min = 0;
|
||||
def->set_default_value(new ConfigOptionFloats{0.});
|
||||
|
||||
def = this->add("retract_lift_below", coFloats);
|
||||
def->label = L("Z hop upper boundary");
|
||||
def->tooltip = L("If this value is positive, Z hop will only come into effect when Z is above the parameter: \"Z hop lower boundary\" and is below this value");
|
||||
def->label = L("Z-hop upper boundary");
|
||||
def->tooltip = L("If this value is positive, Z-hop will only come into effect when Z is above the parameter: \"Z-hop lower boundary\" and is below this value.");
|
||||
def->sidetext = L("mm");
|
||||
def->mode = comAdvanced;
|
||||
def->min = 0;
|
||||
@ -4023,7 +4022,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("z_hop_types", coEnums);
|
||||
def->label = L("Z-hop type");
|
||||
def->tooltip = L("Z hop type");
|
||||
def->tooltip = L("Type of Z-hop.");
|
||||
def->enum_keys_map = &ConfigOptionEnum<ZHopType>::get_enum_values();
|
||||
def->enum_values.push_back("Auto Lift");
|
||||
def->enum_values.push_back("Normal Lift");
|
||||
@ -4038,7 +4037,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("travel_slope", coFloats);
|
||||
def->label = L("Traveling angle");
|
||||
def->tooltip = L("Traveling angle for Slope and Spiral Z hop type. Setting it to 90° results in Normal Lift");
|
||||
def->tooltip = L("Traveling angle for Slope and Spiral Z-hop type. Setting it to 90° results in Normal Lift.");
|
||||
def->sidetext = L("°");
|
||||
def->mode = comAdvanced;
|
||||
def->min = 1;
|
||||
@ -4061,7 +4060,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("retract_lift_enforce", coEnums);
|
||||
def->label = L("On surfaces");
|
||||
def->tooltip = L("Enforce Z Hop behavior. This setting is impacted by the above settings (Only lift Z above/below).");
|
||||
def->tooltip = L("Enforce Z-Hop behavior. This setting is impacted by the above settings (Only lift Z above/below).");
|
||||
def->enum_keys_map = &ConfigOptionEnum<RetractLiftEnforceType>::get_enum_values();
|
||||
def->enum_values.push_back("All Surfaces");
|
||||
def->enum_values.push_back("Top Only");
|
||||
@ -4121,7 +4120,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("disable_m73", coBool);
|
||||
def->label = L("Disable set remaining print time");
|
||||
def->tooltip = L("Disable generating of the M73: Set remaining print time in the final gcode");
|
||||
def->tooltip = L("Disable generating of the M73: Set remaining print time in the final G-code.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
@ -4371,8 +4370,8 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Skirt minimum extrusion length");
|
||||
def->full_label = L("Skirt minimum extrusion length");
|
||||
def->tooltip = L("Minimum filament extrusion length in mm when printing the skirt. Zero means this feature is disabled.\n\n"
|
||||
"Using a non zero value is useful if the printer is set up to print without a prime line.\n"
|
||||
"Final number of loops is not taling into account whli arranging or validating objects distance. Increase loop number in such case.");
|
||||
"Using a non-zero value is useful if the printer is set up to print without a prime line.\n"
|
||||
"Final number of loops is not taking into account while arranging or validating objects distance. Increase loop number in such case.");
|
||||
def->min = 0;
|
||||
def->sidetext = L("mm");
|
||||
def->mode = comAdvanced;
|
||||
@ -4380,8 +4379,8 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("slow_down_layer_time", coFloats);
|
||||
def->label = L("Layer time");
|
||||
def->tooltip = L("The printing speed in exported gcode will be slowed down, when the estimated layer time is shorter than this value, to "
|
||||
"get better cooling for these layers");
|
||||
def->tooltip = L("The printing speed in exported G-code will be slowed down when the estimated layer time is "
|
||||
"shorter than this value in order to get better cooling for these layers.");
|
||||
def->sidetext = L("s");
|
||||
def->min = 0;
|
||||
def->max = 1000;
|
||||
@ -4499,7 +4498,7 @@ void PrintConfigDef::init_fff_params()
|
||||
// TRN PrintSettings : "Ooze prevention" > "Temperature variation"
|
||||
def->tooltip = L("Temperature difference to be applied when an extruder is not active. "
|
||||
"The value is not used when 'idle_temperature' in filament settings "
|
||||
"is set to non zero value.");
|
||||
"is set to non-zero value.");
|
||||
def->sidetext = "∆°C";
|
||||
def->min = -max_temp;
|
||||
def->max = max_temp;
|
||||
@ -4528,7 +4527,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("machine_start_gcode", coString);
|
||||
def->label = L("Start G-code");
|
||||
def->tooltip = L("Start G-code when start the whole printing");
|
||||
def->tooltip = L("Start G-code when starting the entire print.");
|
||||
def->multiline = true;
|
||||
def->full_width = true;
|
||||
def->height = 12;
|
||||
@ -4573,8 +4572,8 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("wipe_tower_no_sparse_layers", coBool);
|
||||
def->label = L("No sparse layers (beta)");
|
||||
def->tooltip = L("If enabled, the wipe tower will not be printed on layers with no toolchanges. "
|
||||
"On layers with a toolchange, extruder will travel downward to print the wipe tower. "
|
||||
def->tooltip = L("If enabled, the wipe tower will not be printed on layers with no tool changes. "
|
||||
"On layers with a tool change, extruder will travel downward to print the wipe tower. "
|
||||
"User is responsible for ensuring there is no collision with the print.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
@ -5127,12 +5126,17 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("chamber_temperature", coInts);
|
||||
def->label = L("Chamber temperature");
|
||||
def->tooltip = L("For high-temperature materials like ABS, ASA, PC, and PA, a higher chamber temperature can help suppress or reduce warping and potentially lead to higher interlayer bonding strength. "
|
||||
"However, at the same time, a higher chamber temperature will reduce the efficiency of air filtration for ABS and ASA. \n\n"
|
||||
"For PLA, PETG, TPU, PVA, and other low-temperature materials, this option should be disabled (set to 0) as the chamber temperature should be low to avoid extruder clogging caused "
|
||||
"by material softening at the heat break.\n\n"
|
||||
"If enabled, this parameter also sets a gcode variable named chamber_temperature, which can be used to pass the desired chamber temperature to your print start macro, "
|
||||
"or a heat soak macro like this: PRINT_START (other variables) CHAMBER_TEMP=[chamber_temperature]. This may be useful if your printer does not support M141/M191 commands, or if you desire "
|
||||
def->tooltip = L("For high-temperature materials like ABS, ASA, PC, and PA, a higher chamber temperature can help "
|
||||
"suppress or reduce warping and potentially lead to higher interlayer bonding strength. "
|
||||
"However, at the same time, a higher chamber temperature will reduce the efficiency of air "
|
||||
"filtration for ABS and ASA.\n\n"
|
||||
"For PLA, PETG, TPU, PVA, and other low-temperature materials, this option should be disabled "
|
||||
"(set to 0) as the chamber temperature should be low to avoid extruder clogging caused by "
|
||||
"material softening at the heat break.\n\n"
|
||||
"If enabled, this parameter also sets a G-code variable named chamber_temperature, which can be "
|
||||
"used to pass the desired chamber temperature to your print start macro, or a heat soak macro "
|
||||
"like this: PRINT_START (other variables) CHAMBER_TEMP=[chamber_temperature]. "
|
||||
"This may be useful if your printer does not support M141/M191 commands, or if you desire "
|
||||
"to handle heat soaking in the print start macro if no active chamber heater is installed."
|
||||
);
|
||||
def->sidetext = L("°C");
|
||||
@ -5181,7 +5185,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("change_filament_gcode", coString);
|
||||
def->label = L("Change filament G-code");
|
||||
def->tooltip = L("This gcode is inserted when change filament, including T command to trigger tool change");
|
||||
def->tooltip = L("This G-code is inserted when filament is changed, including T commands to trigger tool change.");
|
||||
def->multiline = true;
|
||||
def->full_width = true;
|
||||
def->height = 5;
|
||||
@ -5190,7 +5194,7 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("change_extrusion_role_gcode", coString);
|
||||
def->label = L("Change extrusion role G-code");
|
||||
def->tooltip = L("This gcode is inserted when the extrusion role is changed");
|
||||
def->tooltip = L("This G-code is inserted when the extrusion role is changed.");
|
||||
def->multiline = true;
|
||||
def->full_width = true;
|
||||
def->height = 5;
|
||||
@ -5252,7 +5256,7 @@ void PrintConfigDef::init_fff_params()
|
||||
//def->label = L("Z travel");
|
||||
//def->tooltip = L("Speed of vertical travel along z axis. "
|
||||
// "This is typically lower because build plate or gantry is hard to be moved. "
|
||||
// "Zero means using travel speed directly in gcode, but will be limited by printer's ability when run gcode");
|
||||
// "Zero means using travel speed directly in G-code, but will be limited by printer's ability when run G-code.");
|
||||
def->sidetext = L("mm/s");
|
||||
def->min = 0;
|
||||
def->mode = comDevelop;
|
||||
@ -5260,8 +5264,8 @@ void PrintConfigDef::init_fff_params()
|
||||
|
||||
def = this->add("wipe", coBools);
|
||||
def->label = L("Wipe while retracting");
|
||||
def->tooltip = L("Move nozzle along the last extrusion path when retracting to clean leaked material on nozzle. "
|
||||
"This can minimize blob when print new part after travel");
|
||||
def->tooltip = L("Move nozzle along the last extrusion path when retracting to clean any leaked material on the nozzle. "
|
||||
"This can minimize blobs when printing a new part after traveling.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBools { false });
|
||||
|
||||
@ -5415,8 +5419,8 @@ void PrintConfigDef::init_fff_params()
|
||||
def->category = L("Flush options");
|
||||
def->label = L("Flush into this object");
|
||||
def->tooltip = L("This object will be used to purge the nozzle after a filament change to save filament and decrease the print time. "
|
||||
"Colours of the objects will be mixed as a result. "
|
||||
"It will not take effect, unless the prime tower is enabled.");
|
||||
"Colors of the objects will be mixed as a result. "
|
||||
"It will not take effect unless the prime tower is enabled.");
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
def = this->add("wipe_tower_bridging", coFloat);
|
||||
@ -5691,9 +5695,9 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("detect_narrow_internal_solid_infill", coBool);
|
||||
def->label = L("Detect narrow internal solid infill");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("This option will auto detect narrow internal solid infill area."
|
||||
" If enabled, concentric pattern will be used for the area to speed printing up."
|
||||
" Otherwise, rectilinear pattern is used by default.");
|
||||
def->tooltip = L("This option will auto-detect narrow internal solid infill areas. "
|
||||
"If enabled, the concentric pattern will be used for the area to speed up printing. "
|
||||
"Otherwise, the rectilinear pattern will be used by default.");
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionBool(true));
|
||||
}
|
||||
@ -7348,7 +7352,7 @@ CLIActionsConfigDef::CLIActionsConfigDef()
|
||||
// must define new params here, otherwise comamnd param check will fail
|
||||
def = this->add("no_check", coBool);
|
||||
def->label = L("No check");
|
||||
def->tooltip = L("Do not run any validity checks, such as gcode path conflicts check.");
|
||||
def->tooltip = L("Do not run any validity checks, such as G-code path conflicts check.");
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
def = this->add("normative_check", coBool);
|
||||
@ -7631,8 +7635,8 @@ CLIMiscConfigDef::CLIMiscConfigDef()
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
def = this->add("load_custom_gcodes", coString);
|
||||
def->label = L("Load custom gcode");
|
||||
def->tooltip = L("Load custom gcode from json");
|
||||
def->label = L("Load custom G-code");
|
||||
def->tooltip = L("Load custom G-code from json.");
|
||||
def->cli_params = "custom_gcode_toolchange.json";
|
||||
def->set_default_value(new ConfigOptionString());
|
||||
|
||||
@ -7658,8 +7662,8 @@ CLIMiscConfigDef::CLIMiscConfigDef()
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
def = this->add("skip_modified_gcodes", coBool);
|
||||
def->label = L("Skip modified gcodes in 3mf");
|
||||
def->tooltip = L("Skip the modified gcodes in 3mf from Printer or filament Presets");
|
||||
def->label = L("Skip modified G-code in 3mf");
|
||||
def->tooltip = L("Skip the modified G-code in 3mf from Printer or filament Presets.");
|
||||
def->cli_params = "option";
|
||||
def->set_default_value(new ConfigOptionBool(false));
|
||||
|
||||
@ -7723,8 +7727,8 @@ ReadOnlySlicingStatesConfigDef::ReadOnlySlicingStatesConfigDef()
|
||||
ConfigOptionDef* def;
|
||||
|
||||
def = this->add("zhop", coFloat);
|
||||
def->label = L("Current z-hop");
|
||||
def->tooltip = L("Contains z-hop present at the beginning of the custom G-code block.");
|
||||
def->label = L("Current Z-hop");
|
||||
def->tooltip = L("Contains Z-hop present at the beginning of the custom G-code block.");
|
||||
}
|
||||
|
||||
ReadWriteSlicingStatesConfigDef::ReadWriteSlicingStatesConfigDef()
|
||||
@ -7800,8 +7804,8 @@ PrintStatisticsConfigDef::PrintStatisticsConfigDef()
|
||||
def->tooltip = L("Total filament volume extruded per extruder during the entire print.");
|
||||
|
||||
def = this->add("total_toolchanges", coInt);
|
||||
def->label = L("Total toolchanges");
|
||||
def->tooltip = L("Number of toolchanges during the print.");
|
||||
def->label = L("Total tool changes");
|
||||
def->tooltip = L("Number of tool changes during the print.");
|
||||
|
||||
def = this->add("extruded_volume_total", coFloat);
|
||||
def->label = L("Total volume");
|
||||
@ -7996,7 +8000,7 @@ OtherPresetsConfigDef::OtherPresetsConfigDef()
|
||||
|
||||
|
||||
static std::map<t_custom_gcode_key, t_config_option_keys> s_CustomGcodeSpecificPlaceholders{
|
||||
// Machine Gcode
|
||||
// Machine G-code
|
||||
{"machine_start_gcode", {}},
|
||||
{"machine_end_gcode", {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
|
||||
{"before_layer_change_gcode", {"layer_num", "layer_z", "max_layer_z"}},
|
||||
@ -8013,7 +8017,7 @@ static std::map<t_custom_gcode_key, t_config_option_keys> s_CustomGcodeSpecificP
|
||||
{"printing_by_object_gcode", {}},
|
||||
{"machine_pause_gcode", {}},
|
||||
{"template_custom_gcode", {}},
|
||||
//Filament Gcode
|
||||
// Filament G-code
|
||||
{"filament_start_gcode", {"filament_extruder_id"}},
|
||||
{"filament_end_gcode", {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
|
||||
};
|
||||
|
||||
@ -1049,7 +1049,7 @@ void PrintObject::slice_volumes()
|
||||
this->active_step_add_warning(
|
||||
PrintStateBase::WarningLevel::CRITICAL,
|
||||
L("An object's XY size compensation will not be used because it is also color-painted.\nXY Size "
|
||||
"compensation can not be combined with color-painting."));
|
||||
"compensation cannot be combined with color-painting."));
|
||||
BOOST_LOG_TRIVIAL(info) << "xy compensation will not work for object " << this->model_object()->name << " for multi filament.";
|
||||
}
|
||||
|
||||
|
||||
@ -1005,7 +1005,7 @@ bool SupportTreeBuildsteps::search_pillar_and_connect(const Head &source)
|
||||
Vec3d querypt = source.junction_point();
|
||||
|
||||
while(nearest_id < 0 && !spindex.empty()) { m_thr();
|
||||
// loop until a suitable head is not found
|
||||
// loop until a suitable head was not found
|
||||
// if there is a pillar closer than the cluster center
|
||||
// (this may happen as the clustering is not perfect)
|
||||
// than we will bridge to this closer pillar
|
||||
|
||||
@ -158,7 +158,7 @@ void AMSMaterialsSetting::create_panel_normal(wxWindow* parent)
|
||||
|
||||
wxBoxSizer* m_sizer_colour = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
||||
m_title_colour = new wxStaticText(parent, wxID_ANY, _L("Colour"), wxDefaultPosition, wxSize(AMS_MATERIALS_SETTING_LABEL_WIDTH, -1), 0);
|
||||
m_title_colour = new wxStaticText(parent, wxID_ANY, _L("Color"), wxDefaultPosition, wxSize(AMS_MATERIALS_SETTING_LABEL_WIDTH, -1), 0);
|
||||
m_title_colour->SetFont(::Label::Body_13);
|
||||
m_title_colour->SetForegroundColour(AMS_MATERIALS_SETTING_GREY800);
|
||||
m_title_colour->Wrap(-1);
|
||||
|
||||
@ -199,7 +199,7 @@ void BackgroundSlicingProcess::process_fff()
|
||||
//BBS: add the logic to process from an existed gcode file
|
||||
if (m_print->finished()) {
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(" %1%: skip slicing, to process previous gcode file")%__LINE__;
|
||||
m_fff_print->set_status(80, _utf8(L("Processing G-Code from Previous file...")));
|
||||
m_fff_print->set_status(80, _utf8(L("Processing G-code from Previous file...")));
|
||||
wxCommandEvent evt(m_event_slicing_completed_id);
|
||||
// Post the Slicing Finished message for the G-code viewer to update.
|
||||
// Passing the timestamp
|
||||
@ -886,7 +886,7 @@ void BackgroundSlicingProcess::export_gcode()
|
||||
//break;
|
||||
default:
|
||||
BOOST_LOG_TRIVIAL(error) << "Fail code(" << (int)copy_ret_val << ") when copy "<<output_path<<" to " << export_path << ".";
|
||||
throw Slic3r::ExportError((boost::format(_utf8(L("Failed to save gcode file.\nError message: %1%.\nSource file %2%."))) % error_message % output_path).str());
|
||||
throw Slic3r::ExportError((boost::format(_utf8(L("Failed to save G-code file.\nError message: %1%.\nSource file %2%."))) % error_message % output_path).str());
|
||||
//throw Slic3r::ExportError(_utf8(L("Unknown error when export G-code.")));
|
||||
break;
|
||||
}
|
||||
|
||||
@ -201,7 +201,7 @@ bool CalibrationWizard::save_preset(const std::string &old_preset_name, const st
|
||||
PresetCollection *filament_presets = &wxGetApp().preset_bundle->filaments;
|
||||
Preset* preset = filament_presets->find_preset(old_preset_name);
|
||||
if (!preset) {
|
||||
message = wxString::Format(_L("The selected preset: %s is not found."), old_preset_name);
|
||||
message = wxString::Format(_L("The selected preset: %s was not found."), old_preset_name);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -1074,7 +1074,7 @@ bool CalibrationPresetPage::is_filaments_compatiable(const std::vector<Preset*>
|
||||
}
|
||||
|
||||
if (!Print::check_multi_filaments_compatibility(filament_types)) {
|
||||
error_tips = _u8L("Can not print multiple filaments which have large difference of temperature together. Otherwise, the extruder and nozzle may be blocked or damaged during printing");
|
||||
error_tips = _u8L("Cannot print multiple filaments which have large difference of temperature together. Otherwise, the extruder and nozzle may be blocked or damaged during printing");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -1018,7 +1018,7 @@ wxBoxSizer *CreateFilamentPresetDialog::create_button_item()
|
||||
} else {
|
||||
vendor_name = into_u8(m_filament_custom_vendor_input->GetTextCtrl()->GetValue());
|
||||
if (vendor_name == "Bambu" || vendor_name == "Generic") {
|
||||
MessageDialog dlg(this, _L("\"Bambu\" or \"Generic\" can not be used as a Vendor for custom filaments."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
MessageDialog dlg(this, _L("\"Bambu\" or \"Generic\" cannot be used as a Vendor for custom filaments."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
wxYES | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return;
|
||||
@ -1065,7 +1065,7 @@ wxBoxSizer *CreateFilamentPresetDialog::create_button_item()
|
||||
return;
|
||||
}
|
||||
if (m_can_not_find_vendor_checkbox->GetValue() && str_is_all_digit(vendor_name)) {
|
||||
MessageDialog dlg(this, _L("The vendor can not be a number. Please re-enter."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
MessageDialog dlg(this, _L("The vendor cannot be a number. Please re-enter."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
wxYES | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return;
|
||||
@ -1724,7 +1724,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_printer_item(wxWindow *parent)
|
||||
m_select_model->SetLabelColor(*wxBLACK);
|
||||
}
|
||||
} else {
|
||||
MessageDialog dlg(this, _L("The model is not found, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES | wxYES_DEFAULT | wxCENTRE);
|
||||
MessageDialog dlg(this, _L("The model was not found, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
}
|
||||
e.Skip();
|
||||
@ -2145,8 +2145,8 @@ bool CreatePrinterPresetDialog::load_system_and_user_presets_with_curr_model(Pre
|
||||
}
|
||||
}
|
||||
if (m_printer_preset_vendor_selected.id.empty() || m_printer_preset_model_selected.id.empty()) {
|
||||
BOOST_LOG_TRIVIAL(info) << "selected id is not find";
|
||||
MessageDialog dlg(this, _L("Preset path is not find, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
BOOST_LOG_TRIVIAL(info) << "selected id was not found";
|
||||
MessageDialog dlg(this, _L("Preset path was not found, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return false;
|
||||
}
|
||||
@ -2166,8 +2166,8 @@ bool CreatePrinterPresetDialog::load_system_and_user_presets_with_curr_model(Pre
|
||||
}
|
||||
|
||||
if (preset_path.empty()) {
|
||||
BOOST_LOG_TRIVIAL(info) << "Preset path is not find";
|
||||
MessageDialog dlg(this, _L("Preset path is not find, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
BOOST_LOG_TRIVIAL(info) << "Preset path was not found";
|
||||
MessageDialog dlg(this, _L("Preset path was not found, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return false;
|
||||
@ -2204,7 +2204,7 @@ bool CreatePrinterPresetDialog::load_system_and_user_presets_with_curr_model(Pre
|
||||
varient = model_varient.substr(index_at + 3, index_nozzle - index_at - 4);
|
||||
} else {
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "get nozzle failed";
|
||||
MessageDialog dlg(this, _L("The nozzle diameter is not found, please reselect."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
MessageDialog dlg(this, _L("The nozzle diameter was not found, please reselect."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return false;
|
||||
}
|
||||
@ -2215,7 +2215,7 @@ bool CreatePrinterPresetDialog::load_system_and_user_presets_with_curr_model(Pre
|
||||
if (temp_printer_preset) {
|
||||
m_printer_preset = new Preset(*temp_printer_preset);
|
||||
} else {
|
||||
MessageDialog dlg(this, _L("The printer preset is not found, please reselect."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
MessageDialog dlg(this, _L("The printer preset was not found, please reselect."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return false;
|
||||
}
|
||||
@ -2230,8 +2230,8 @@ bool CreatePrinterPresetDialog::load_system_and_user_presets_with_curr_model(Pre
|
||||
preset_path = (boost::filesystem::path(Slic3r::resources_dir()) / PRESET_PROFILES_TEMOLATE_DIR).string();
|
||||
}
|
||||
if (preset_path.empty()) {
|
||||
BOOST_LOG_TRIVIAL(info) << "Preset path is not find";
|
||||
MessageDialog dlg(this, _L("Preset path is not find, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
BOOST_LOG_TRIVIAL(info) << "Preset path was not found";
|
||||
MessageDialog dlg(this, _L("Preset path was not found, please reselect vendor."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"),
|
||||
wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return false;
|
||||
@ -2942,7 +2942,7 @@ bool CreatePrinterPresetDialog::data_init()
|
||||
if (iterator != vendors.end()) {
|
||||
m_printer_preset_vendor_selected = iterator->second;
|
||||
} else {
|
||||
MessageDialog dlg(this, _L("Vendor is not find, please reselect."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
MessageDialog dlg(this, _L("Vendor was not found, please reselect."), wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
|
||||
dlg.ShowModal();
|
||||
return;
|
||||
}
|
||||
@ -4499,7 +4499,7 @@ void EditFilamentPresetDialog::delete_preset()
|
||||
}
|
||||
wxString msg;
|
||||
if (count > 0) {
|
||||
msg = _L("Presets inherited by other presets can not be deleted");
|
||||
msg = _L("Presets inherited by other presets cannot be deleted");
|
||||
msg += "\n";
|
||||
msg += _L_PLURAL("The following presets inherits this preset.", "The following preset inherits this preset.", count);
|
||||
wxString title = _L("Delete Preset");
|
||||
|
||||
@ -141,7 +141,7 @@ wxString get_stage_string(int stage)
|
||||
case 29:
|
||||
return _L("Cooling chamber");
|
||||
case 30:
|
||||
return _L("Paused by the Gcode inserted by user");
|
||||
return _L("Paused by the G-code inserted by user");
|
||||
case 31:
|
||||
return _L("Motor noise showoff");
|
||||
case 32:
|
||||
@ -4344,7 +4344,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
|
||||
if (jj.contains("result")) {
|
||||
result = jj["result"].get<std::string>();
|
||||
if (result == "FAIL") {
|
||||
wxString text = _L("Failed to start printing job");
|
||||
wxString text = _L("Failed to start print job");
|
||||
GUI::wxGetApp().push_notification(text);
|
||||
}
|
||||
}
|
||||
@ -4480,7 +4480,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
|
||||
info = _L("Selected diameter and machine diameter do not match");
|
||||
}
|
||||
else if (reason == "generate auto filament cali gcode failure") {
|
||||
info = _L("Failed to generate cali gcode");
|
||||
info = _L("Failed to generate cali G-code");
|
||||
}
|
||||
else {
|
||||
info = reason;
|
||||
|
||||
@ -55,7 +55,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
|
||||
m_search_bar = new wxSearchCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
|
||||
m_search_bar->ShowSearchButton(true);
|
||||
m_search_bar->ShowCancelButton(true);
|
||||
m_search_bar->SetDescriptiveText(_L("Search gcode placeholders"));
|
||||
m_search_bar->SetDescriptiveText(_L("Search G-code placeholders"));
|
||||
m_search_bar->SetForegroundColour(*wxBLACK);
|
||||
wxGetApp().UpdateDarkUI(m_search_bar);
|
||||
|
||||
@ -356,7 +356,7 @@ void EditGCodeDialog::selection_changed(wxDataViewEvent& evt)
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Orca: move below checking for def in custom defined gcode placeholders
|
||||
// Orca: move below checking for def in custom defined G-code placeholders
|
||||
// This allows custom placeholders to override the default ones for this dialog
|
||||
// Override custom def if selection is within the preset category
|
||||
if (!def || m_params_list->GetSelectedTopLevelCategory() == "Presets") {
|
||||
|
||||
@ -2343,7 +2343,7 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result, const
|
||||
static const unsigned int progress_threshold = 1000;
|
||||
//BBS: add only gcode mode
|
||||
ProgressDialog * progress_dialog = m_only_gcode_in_preview ?
|
||||
new ProgressDialog(_L("Loading G-codes"), "...",
|
||||
new ProgressDialog(_L("Loading G-code"), "...",
|
||||
100, wxGetApp().mainframe, wxPD_AUTO_HIDE | wxPD_APP_MODAL) : nullptr;
|
||||
|
||||
wxBusyCursor busy;
|
||||
@ -5503,7 +5503,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
|
||||
}
|
||||
}
|
||||
}
|
||||
// Custom g-code overview
|
||||
// Custom G-code overview
|
||||
std::vector<CustomGCode::Item> custom_gcode_per_print_z = wxGetApp().is_editor() ?
|
||||
wxGetApp().plater()->model().get_curr_plate_custom_gcodes().gcodes :
|
||||
m_custom_gcode_per_print_z;
|
||||
@ -5511,13 +5511,13 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
|
||||
float max_len = window_padding + 2 * ImGui::GetStyle().ItemSpacing.x;
|
||||
ImGui::Spacing();
|
||||
// Title Line
|
||||
std::string cgcode_title_str = _u8L("Custom g-code");
|
||||
std::string cgcode_title_str = _u8L("Custom G-code");
|
||||
std::string cgcode_layer_str = _u8L("Layer");
|
||||
std::string cgcode_time_str = _u8L("Time");
|
||||
// Types of custom gcode
|
||||
std::string cgcode_pause_str = _u8L("Pause");
|
||||
std::string cgcode_template_str= _u8L("Template");
|
||||
std::string cgcode_toolchange_str = _u8L("ToolChange");
|
||||
std::string cgcode_toolchange_str = _u8L("Tool Change");
|
||||
std::string cgcode_custom_str = _u8L("Custom");
|
||||
std::string cgcode_unknown_str = _u8L("Unknown");
|
||||
|
||||
|
||||
@ -9656,7 +9656,7 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
|
||||
std::string objName2 = m_gcode_viewer.m_conflict_result.value()._objName2;
|
||||
double height = m_gcode_viewer.m_conflict_result.value()._height;
|
||||
int layer = m_gcode_viewer.m_conflict_result.value().layer;
|
||||
text = (boost::format(_u8L("Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please separate the conflicted objects farther (%s <-> %s).")) % layer %
|
||||
text = (boost::format(_u8L("Conflicts of G-code paths have been found at layer %d, z = %.2lf mm. Please separate the conflicted objects farther (%s <-> %s).")) % layer %
|
||||
height % objName1 % objName2)
|
||||
.str();
|
||||
prevConflictText = text;
|
||||
@ -9664,14 +9664,14 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
|
||||
conflictObj = obj2->model_object();
|
||||
break;
|
||||
}
|
||||
case EWarning::ObjectOutside: text = _u8L("An object is layed over the boundary of plate."); break;
|
||||
case EWarning::ObjectOutside: text = _u8L("An object is laid over the plate boundaries."); break;
|
||||
case EWarning::ToolHeightOutside: text = _u8L("A G-code path goes beyond the max print height."); error = ErrorType::SLICING_ERROR; break;
|
||||
case EWarning::ToolpathOutside: text = _u8L("A G-code path goes beyond the boundary of plate."); error = ErrorType::SLICING_ERROR; break;
|
||||
case EWarning::ToolpathOutside: text = _u8L("A G-code path goes beyond the plate boundaries."); error = ErrorType::SLICING_ERROR; break;
|
||||
// BBS: remove _u8L() for SLA
|
||||
case EWarning::SlaSupportsOutside: text = ("SLA supports outside the print area were detected."); error = ErrorType::PLATER_ERROR; break;
|
||||
case EWarning::SomethingNotShown: text = _u8L("Only the object being edit is visible."); break;
|
||||
case EWarning::ObjectClashed:
|
||||
text = _u8L("An object is laid over the boundary of plate or exceeds the height limit.\n"
|
||||
text = _u8L("An object is laid over the plate boundaries or exceeds the height limit.\n"
|
||||
"Please solve the problem by moving it totally on or off the plate, and confirming that the height is within the build volume.");
|
||||
error = ErrorType::PLATER_ERROR;
|
||||
break;
|
||||
|
||||
@ -171,7 +171,7 @@ void ArrangeJob::prepare_selected() {
|
||||
m_selected.swap(m_unselected);
|
||||
else {
|
||||
m_plater->get_notification_manager()->push_notification(NotificationType::BBLPlateInfo,
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("All the selected objects are on the locked plate,\nWe can not do auto-arrange on these objects.")));
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("All the selected objects are on a locked plate.\nCannot auto-arrange these objects.")));
|
||||
}
|
||||
}
|
||||
|
||||
@ -241,7 +241,7 @@ void ArrangeJob::prepare_all() {
|
||||
}
|
||||
else {
|
||||
m_plater->get_notification_manager()->push_notification(NotificationType::BBLPlateInfo,
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("All the selected objects are on the locked plate,\nWe can not do auto-arrange on these objects.")));
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("All the selected objects are on a locked plate.\nCannot auto-arrange these objects.")));
|
||||
}
|
||||
}
|
||||
|
||||
@ -379,7 +379,7 @@ void ArrangeJob::prepare_partplate() {
|
||||
|
||||
if (plate->is_locked()) {
|
||||
m_plater->get_notification_manager()->push_notification(NotificationType::BBLPlateInfo,
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("This plate is locked,\nWe can not do auto-arrange on this plate.")));
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("This plate is locked.\nCannot auto-arrange on this plate.")));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -75,7 +75,7 @@ void OrientJob::prepare_selection(std::vector<bool> obj_sel, bool only_one_plate
|
||||
}
|
||||
else {
|
||||
m_plater->get_notification_manager()->push_notification(NotificationType::BBLPlateInfo,
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("All the selected objects are on the locked plate,\nWe can not do auto-orient on these objects.")));
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("All the selected objects are on a locked plate.\nCannot auto-orient these objects.")));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -113,7 +113,7 @@ void OrientJob::prepare_partplate() {
|
||||
|
||||
if (plate->is_locked()) {
|
||||
m_plater->get_notification_manager()->push_notification(NotificationType::BBLPlateInfo,
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("This plate is locked,\nWe can not do auto-orient on this plate.")));
|
||||
NotificationManager::NotificationLevel::WarningNotificationLevel, into_u8(_L("This plate is locked.\nCannot auto-orient on this plate.")));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -194,18 +194,18 @@ void SendJob::process(Ctl &ctl)
|
||||
&msg, &curr_percent, &error_text, StagePercentPoint](int stage, int code, std::string info) {
|
||||
if (stage == SendingPrintJobStage::PrintingStageCreate) {
|
||||
if (this->connection_type == "lan") {
|
||||
msg = _u8L("Sending gcode file over LAN");
|
||||
msg = _u8L("Sending G-code file over LAN");
|
||||
} else {
|
||||
msg = _u8L("Sending gcode file to sdcard");
|
||||
msg = _u8L("Sending G-code file to SD card");
|
||||
}
|
||||
}
|
||||
else if (stage == SendingPrintJobStage::PrintingStageUpload) {
|
||||
if (code >= 0 && code <= 100 && !info.empty()) {
|
||||
if (this->connection_type == "lan") {
|
||||
msg = _u8L("Sending gcode file over LAN");
|
||||
msg = _u8L("Sending G-code file over LAN");
|
||||
}
|
||||
else {
|
||||
msg = _u8L("Sending gcode file to sdcard");
|
||||
msg = _u8L("Sending G-code file to SD card");
|
||||
}
|
||||
if (!info.empty()) {
|
||||
msg += format("(%s)", info);
|
||||
@ -217,10 +217,10 @@ void SendJob::process(Ctl &ctl)
|
||||
}
|
||||
else {
|
||||
if (this->connection_type == "lan") {
|
||||
msg = _u8L("Sending gcode file over LAN");
|
||||
msg = _u8L("Sending G-code file over LAN");
|
||||
}
|
||||
else {
|
||||
msg = _u8L("Sending gcode file over LAN");
|
||||
msg = _u8L("Sending G-code file over LAN");
|
||||
}
|
||||
}
|
||||
|
||||
@ -273,7 +273,7 @@ void SendJob::process(Ctl &ctl)
|
||||
&& this->has_sdcard) {
|
||||
// try to send local with record
|
||||
BOOST_LOG_TRIVIAL(info) << "send_job: try to send gcode to printer";
|
||||
ctl.update_status(curr_percent, _u8L("Sending gcode file over LAN"));
|
||||
ctl.update_status(curr_percent, _u8L("Sending G-code file over LAN"));
|
||||
result = m_agent->start_send_gcode_to_sdcard(params, update_fn, cancel_fn, nullptr);
|
||||
if (result == BAMBU_NETWORK_ERR_FTP_UPLOAD_FAILED) {
|
||||
params.comments = "upload_failed";
|
||||
@ -283,15 +283,15 @@ void SendJob::process(Ctl &ctl)
|
||||
if (result < 0) {
|
||||
// try to send with cloud
|
||||
BOOST_LOG_TRIVIAL(info) << "send_job: try to send gcode file to printer";
|
||||
ctl.update_status(curr_percent, _u8L("Sending gcode file over LAN"));
|
||||
ctl.update_status(curr_percent, _u8L("Sending G-code file over LAN"));
|
||||
}
|
||||
} else {
|
||||
BOOST_LOG_TRIVIAL(info) << "send_job: try to send gcode file to printer";
|
||||
ctl.update_status(curr_percent, _u8L("Sending gcode file over LAN"));
|
||||
ctl.update_status(curr_percent, _u8L("Sending G-code file over LAN"));
|
||||
}
|
||||
} else {
|
||||
if (this->has_sdcard) {
|
||||
ctl.update_status(curr_percent, _u8L("Sending gcode file over LAN"));
|
||||
ctl.update_status(curr_percent, _u8L("Sending G-code file over LAN"));
|
||||
result = m_agent->start_send_gcode_to_sdcard(params, update_fn, cancel_fn, nullptr);
|
||||
} else {
|
||||
ctl.update_status(curr_percent, _u8L("An SD card needs to be inserted before sending to printer."));
|
||||
|
||||
@ -307,7 +307,7 @@ void KBShortcutsDialog::fill_shortcuts()
|
||||
{ L("Arrow Left"), L("Horizontal slider - Move active thumb Left")},
|
||||
{ L("Arrow Right"), L("Horizontal slider - Move active thumb Right")},
|
||||
{ "L", L("On/Off one layer mode of the vertical slider")},
|
||||
{ "C", L("On/Off g-code window")},
|
||||
{ "C", L("On/Off G-code window")},
|
||||
{ "Tab", L("Switch between Prepare/Preview") },
|
||||
{L("Shift+Any arrow"), L("Move slider 5x faster")},
|
||||
{L("Shift+Mouse wheel"), L("Move slider 5x faster")},
|
||||
|
||||
@ -2692,7 +2692,7 @@ void MainFrame::init_menubar_as_editor()
|
||||
[this]() { return wxGetApp().app_config->get_bool("auto_perspective"); }, this);
|
||||
|
||||
viewMenu->AppendSeparator();
|
||||
append_menu_check_item(viewMenu, wxID_ANY, _L("Show &G-code Window") + sep + "C", _L("Show g-code window in Preview scene"),
|
||||
append_menu_check_item(viewMenu, wxID_ANY, _L("Show &G-code Window") + sep + "C", _L("Show G-code window in Preview scene"),
|
||||
[this](wxCommandEvent &) {
|
||||
wxGetApp().toggle_show_gcode_window();
|
||||
m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT));
|
||||
|
||||
@ -2957,7 +2957,7 @@ void NotificationManager::bbl_close_need_support_on_notification()
|
||||
void NotificationManager::bbl_show_gcode_overlap_notification()
|
||||
{
|
||||
NotificationData data{NotificationType::BBLGcodeOverlap, NotificationLevel::WarningNotificationLevel, 0,
|
||||
_u8L("Warning:") + "\n" + _u8L("Gcode path overlap")};
|
||||
_u8L("Warning:") + "\n" + _u8L("G-code path overlap")};
|
||||
|
||||
for (std::unique_ptr<PopNotification> ¬ification : m_pop_notifications) {
|
||||
if (notification->get_type() == NotificationType::BBLGcodeOverlap) {
|
||||
|
||||
@ -3855,7 +3855,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
|
||||
// load_config = false;
|
||||
// if (!load_model) {
|
||||
// // only load config case, return directly
|
||||
// show_info(q, _L("The Config can not be loaded."), _L("Load 3mf"));
|
||||
// show_info(q, _L("The Config cannot be loaded."), _L("Load 3mf"));
|
||||
// q->skip_thumbnail_invalid = false;
|
||||
// return empty_result;
|
||||
// }
|
||||
@ -4038,9 +4038,9 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
|
||||
for (std::set<std::string>::iterator it=modified_gcodes.begin(); it!=modified_gcodes.end(); ++it)
|
||||
warning_message += "-" + *it + "\n";
|
||||
warning_message += "\n";
|
||||
//show_info(q, _L("The 3mf has following modified G-codes in filament or printer presets:") + warning_message+ _L("Please confirm that these modified G-codes are safe to prevent any damage to the machine!"), _L("Modified G-codes"));
|
||||
//show_info(q, _L("The 3mf has following modified G-codes in filament or printer presets:") + warning_message+ _L("Please confirm that these modified G-codes are safe to prevent any damage to the machine!"), _L("Modified G-code"));
|
||||
|
||||
MessageDialog dlg(q, _L("The 3mf has following modified G-codes in filament or printer presets:") + warning_message+ _L("Please confirm that these modified G-codes are safe to prevent any damage to the machine!"), _L("Modified G-codes"));
|
||||
MessageDialog dlg(q, _L("The 3mf has following modified G-codes in filament or printer presets:") + warning_message+ _L("Please confirm that these modified G-codes are safe to prevent any damage to the machine!"), _L("Modified G-code"));
|
||||
dlg.show_dsa_button();
|
||||
auto res = dlg.ShowModal();
|
||||
if (dlg.get_checkbox_state())
|
||||
@ -7533,7 +7533,7 @@ void Plater::priv::show_install_plugin_hint(wxCommandEvent &event)
|
||||
|
||||
void Plater::priv::show_preview_only_hint(wxCommandEvent &event)
|
||||
{
|
||||
notification_manager->bbl_show_preview_only_notification(into_u8(_L("Preview only mode:\nThe loaded file contains gcode only, Can not enter the Prepare page")));
|
||||
notification_manager->bbl_show_preview_only_notification(into_u8(_L("Preview only mode:\nThe loaded file contains G-code only, cannot enter the Prepare page.")));
|
||||
}
|
||||
|
||||
void Plater::priv::on_apple_change_color_mode(wxSysColourChangedEvent& evt) {
|
||||
@ -10482,7 +10482,7 @@ void Plater::load_gcode(const wxString& filename)
|
||||
p->preview->get_canvas3d()->zoom_to_plate(0);
|
||||
|
||||
if (p->preview->get_canvas3d()->get_gcode_layers_zs().empty()) {
|
||||
MessageDialog(this, _L("The selected file") + ":\n" + filename + "\n" + _L("does not contain valid gcode."),
|
||||
MessageDialog(this, _L("The selected file") + ":\n" + filename + "\n" + _L("does not contain valid G-code."),
|
||||
wxString(GCODEVIEWER_APP_NAME) + " - " + _L("Error occurs while loading G-code file"), wxCLOSE | wxICON_WARNING | wxCENTRE).ShowModal();
|
||||
set_project_filename(DEFAULT_PROJECT_NAME);
|
||||
} else {
|
||||
@ -11131,7 +11131,7 @@ bool Plater::load_files(const wxArrayString& filenames)
|
||||
}
|
||||
|
||||
if (!gcode_paths.empty()) {
|
||||
show_info(this, _L("G-code files can not be loaded with models together!"), _L("G-code loading"));
|
||||
show_info(this, _L("G-code files cannot be loaded with models together!"), _L("G-code loading"));
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -11183,7 +11183,7 @@ bool Plater::load_files(const wxArrayString& filenames)
|
||||
if (this->m_only_gcode || this->m_exported_file) {
|
||||
if ((loadfiles_type == LoadFilesType::SingleOther)
|
||||
|| (loadfiles_type == LoadFilesType::MultipleOther)) {
|
||||
show_info(this, _L("Can not add models when in preview mode!"), _L("Add Models"));
|
||||
show_info(this, _L("Cannot add models when in preview mode!"), _L("Add Models"));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -14639,7 +14639,8 @@ void Plater::post_process_string_object_exception(StringObjectException &err)
|
||||
break;
|
||||
}
|
||||
}
|
||||
err.string = format(_L("Plate %d: %s is not suggested to be used to print filament %s(%s). If you still want to do this printing, please set this filament's bed temperature to non-zero."),
|
||||
err.string = format(_L("Plate %d: %s is not suggested to be used to print filament %s(%s). "
|
||||
"If you still want to do this print job, please set this filament's bed temperature to non-zero."),
|
||||
err.params[0], err.params[1], err.params[2], filament_name);
|
||||
err.string += "\n";
|
||||
}
|
||||
|
||||
@ -1277,7 +1277,7 @@ wxWindow* PreferencesDialog::create_general_page()
|
||||
wxGetApp().app_config->set("save_project_choise", "");
|
||||
});
|
||||
// auto item_backup = create_item_switch(_L("Backup switch"), page, _L("Backup switch"), "units");
|
||||
auto item_gcodes_warning = create_item_checkbox(_L("No warnings when loading 3MF with modified G-codes"), page,_L("No warnings when loading 3MF with modified G-codes"), 50, "no_warn_when_modified_gcodes");
|
||||
auto item_gcodes_warning = create_item_checkbox(_L("No warnings when loading 3MF with modified G-code"), page, _L("No warnings when loading 3MF with modified G-code"), 50, "no_warn_when_modified_gcodes");
|
||||
auto item_backup = create_item_checkbox(_L("Auto-Backup"), page,_L("Backup your project periodically for restoring from the occasional crash."), 50, "backup_switch");
|
||||
auto item_backup_interval = create_item_backup_input(_L("every"), page, _L("The period of backup in seconds."), "backup_interval");
|
||||
|
||||
|
||||
@ -670,7 +670,7 @@ PlaterPresetComboBox::PlaterPresetComboBox(wxWindow *parent, Preset::Type preset
|
||||
if (m_type == Preset::TYPE_FILAMENT) {
|
||||
int em = wxGetApp().em_unit();
|
||||
clr_picker = new wxBitmapButton(parent, wxID_ANY, {}, wxDefaultPosition, wxSize(FromDIP(20), FromDIP(20)), wxBU_EXACTFIT | wxBU_AUTODRAW | wxBORDER_NONE);
|
||||
clr_picker->SetToolTip(_L("Click to pick filament color"));
|
||||
clr_picker->SetToolTip(_L("Click to select filament color"));
|
||||
clr_picker->Bind(wxEVT_BUTTON, [this](wxCommandEvent& e) {
|
||||
m_clrData.SetColour(clr_picker->GetBackgroundColour());
|
||||
m_clrData.SetChooseFull(true);
|
||||
@ -681,7 +681,7 @@ PlaterPresetComboBox::PlaterPresetComboBox(wxWindow *parent, Preset::Type preset
|
||||
m_clrData.SetCustomColour(i, string_to_wxColor(colors[i]));
|
||||
}
|
||||
wxColourDialog dialog(this, &m_clrData);
|
||||
dialog.SetTitle(_L("Please choose the filament colour"));
|
||||
dialog.SetTitle(_L("Please choose the filament color"));
|
||||
if ( dialog.ShowModal() == wxID_OK )
|
||||
{
|
||||
m_clrData = dialog.GetColourData();
|
||||
|
||||
@ -39,7 +39,7 @@ static const char *CONFIG_KEY_GROUP = "printhost_group";
|
||||
static const char* CONFIG_KEY_STORAGE = "printhost_storage";
|
||||
|
||||
PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUploadActions post_actions, const wxArrayString &groups, const wxArrayString& storage_paths, const wxArrayString& storage_names, bool switch_to_device_tab)
|
||||
: MsgDialog(static_cast<wxWindow*>(wxGetApp().mainframe), _L("Send G-Code to printer host"), _L("Upload to Printer Host with the following filename:"), 0) // Set style = 0 to avoid default creation of the "OK" button.
|
||||
: MsgDialog(static_cast<wxWindow*>(wxGetApp().mainframe), _L("Send G-code to printer host"), _L("Upload to Printer Host with the following filename:"), 0) // Set style = 0 to avoid default creation of the "OK" button.
|
||||
// All buttons will be added later in this constructor
|
||||
, txt_filename(new wxTextCtrl(this, wxID_ANY))
|
||||
, combo_groups(!groups.IsEmpty() ? new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, groups, wxCB_READONLY) : nullptr)
|
||||
|
||||
@ -2440,7 +2440,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
|
||||
//Check Printer Model Id
|
||||
bool is_same_printer_type = is_same_printer_model();
|
||||
if (!is_same_printer_type && (m_print_type == PrintFromType::FROM_NORMAL)) {
|
||||
confirm_text.push_back(ConfirmBeforeSendInfo(_L("The printer type selected when generating G-Code is not consistent with the currently selected printer. It is recommended that you use the same printer type for slicing.")));
|
||||
confirm_text.push_back(ConfirmBeforeSendInfo(_L("The printer type selected when generating G-code is not consistent with the currently selected printer. It is recommended that you use the same printer type for slicing.")));
|
||||
has_slice_warnings = true;
|
||||
}
|
||||
|
||||
|
||||
@ -166,7 +166,7 @@ static bool check_internet_connection_win()
|
||||
|
||||
|
||||
// Last version where the info was sent / dialog dismissed is saved in appconfig.
|
||||
// Only show the dialog when this info is not found (e.g. fresh install) or when
|
||||
// Only show the dialog when this info was not found (e.g. fresh install) or when
|
||||
// current version is newer. Only major and minor versions are compared.
|
||||
static bool should_dialog_be_shown()
|
||||
{
|
||||
|
||||
@ -4942,7 +4942,7 @@ wxBoxSizer *ScoreDialog::get_button_sizer()
|
||||
++it;
|
||||
break;
|
||||
case BAMBU_NETWORK_ERR_OPEN_FILE_FAILED:
|
||||
error_info += need_upload.second + _L(" can not be opened\n").ToUTF8().data() + "\n";
|
||||
error_info += need_upload.second + _L(" cannot be opened\n").ToUTF8().data() + "\n";
|
||||
m_upload_status_code = StatusCode::UPLOAD_IMG_FAILED;
|
||||
++it;
|
||||
break;
|
||||
|
||||
@ -1611,8 +1611,8 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
|
||||
new_conf.set_key_value("layer_height", new ConfigOptionFloat(layer_height_floor));
|
||||
m_config_manipulation.apply(m_config, &new_conf);
|
||||
} else {
|
||||
wxString msg_text = _(L("Layer height exceeds the limit in Printer Settings -> Extruder -> Layer height limits ,this may "
|
||||
"cause printing quality issues."));
|
||||
wxString msg_text = _(L("Layer height exceeds the limit in Printer Settings -> Extruder -> Layer height limits, "
|
||||
"this may cause printing quality issues."));
|
||||
msg_text += "\n\n" + _(L("Adjust to the set range automatically? \n"));
|
||||
MessageDialog dialog(wxGetApp().plater(), msg_text, "", wxICON_WARNING | wxYES | wxNO);
|
||||
dialog.SetButtonLabel(wxID_YES, _L("Adjust"));
|
||||
@ -3380,32 +3380,38 @@ void TabFilament::build()
|
||||
optgroup->append_line(line);
|
||||
|
||||
optgroup = page->new_optgroup(L("Bed temperature"), L"param_bed_temp");
|
||||
line = {L("Cool Plate (SuperTack)"), L("Bed temperature when cool plate is installed. Value 0 means the filament does not support to print on the Cool Plate SuperTack")};
|
||||
line = { L("Cool Plate (SuperTack)"),
|
||||
L("Bed temperature when the Cool Plate SuperTack is installed. A value of 0 means the filament does not support printing on the Cool Plate SuperTack.") };
|
||||
line.append_option(optgroup->get_option("supertack_plate_temp_initial_layer"));
|
||||
line.append_option(optgroup->get_option("supertack_plate_temp"));
|
||||
optgroup->append_line(line);
|
||||
|
||||
line = { L("Cool Plate"), L("Bed temperature when cool plate is installed. Value 0 means the filament does not support to print on the Cool Plate") };
|
||||
line = { L("Cool Plate"),
|
||||
L("Bed temperature when the Cool Plate is installed. A value of 0 means the filament does not support printing on the Cool Plate.") };
|
||||
line.append_option(optgroup->get_option("cool_plate_temp_initial_layer"));
|
||||
line.append_option(optgroup->get_option("cool_plate_temp"));
|
||||
optgroup->append_line(line);
|
||||
|
||||
line = { L("Textured Cool plate"), L("Bed temperature when cool plate is installed. Value 0 means the filament does not support to print on the Textured Cool Plate") };
|
||||
line = { L("Textured Cool Plate"),
|
||||
L("Bed temperature when the Textured Cool Plate is installed. A value of 0 means the filament does not support printing on the Textured Cool Plate.") };
|
||||
line.append_option(optgroup->get_option("textured_cool_plate_temp_initial_layer"));
|
||||
line.append_option(optgroup->get_option("textured_cool_plate_temp"));
|
||||
optgroup->append_line(line);
|
||||
|
||||
line = { L("Engineering plate"), L("Bed temperature when engineering plate is installed. Value 0 means the filament does not support to print on the Engineering Plate") };
|
||||
line = { L("Engineering Plate"),
|
||||
L("Bed temperature when the Engineering Plate is installed. A value of 0 means the filament does not support printing on the Engineering Plate.") };
|
||||
line.append_option(optgroup->get_option("eng_plate_temp_initial_layer"));
|
||||
line.append_option(optgroup->get_option("eng_plate_temp"));
|
||||
optgroup->append_line(line);
|
||||
|
||||
line = {L("Smooth PEI Plate / High Temp Plate"), L("Bed temperature when Smooth PEI Plate/High temperature plate is installed. Value 0 means the filament does not support to print on the Smooth PEI Plate/High Temp Plate") };
|
||||
line = { L("Smooth PEI Plate / High Temp Plate"),
|
||||
L("Bed temperature when the Smooth PEI Plate/High Temperature Plate is installed. A value of 0 means the filament does not support printing on the Smooth PEI Plate/High Temp Plate.") };
|
||||
line.append_option(optgroup->get_option("hot_plate_temp_initial_layer"));
|
||||
line.append_option(optgroup->get_option("hot_plate_temp"));
|
||||
optgroup->append_line(line);
|
||||
|
||||
line = {L("Textured PEI Plate"), L("Bed temperature when Textured PEI Plate is installed. Value 0 means the filament does not support to print on the Textured PEI Plate")};
|
||||
line = { L("Textured PEI Plate"),
|
||||
L("Bed temperature when the Textured PEI Plate is installed. A value of 0 means the filament does not support printing on the Textured PEI Plate.") };
|
||||
line.append_option(optgroup->get_option("textured_plate_temp_initial_layer"));
|
||||
line.append_option(optgroup->get_option("textured_plate_temp"));
|
||||
optgroup->append_line(line);
|
||||
@ -3534,7 +3540,7 @@ void TabFilament::build()
|
||||
optgroup = page->new_optgroup(L("Wipe tower parameters"), "param_tower");
|
||||
optgroup->append_single_option_line("filament_minimal_purge_on_wipe_tower");
|
||||
|
||||
optgroup = page->new_optgroup(L("Toolchange parameters with single extruder MM printers"), "param_toolchange");
|
||||
optgroup = page->new_optgroup(L("Tool change parameters with single extruder MM printers"), "param_toolchange");
|
||||
optgroup->append_single_option_line("filament_loading_speed_start", "semm");
|
||||
optgroup->append_single_option_line("filament_loading_speed", "semm");
|
||||
optgroup->append_single_option_line("filament_unloading_speed_start", "semm");
|
||||
@ -3579,7 +3585,7 @@ void TabFilament::build()
|
||||
return sizer;
|
||||
});
|
||||
|
||||
optgroup = page->new_optgroup(L("Toolchange parameters with multi extruder MM printers"), "param_toolchange_multi_extruder");
|
||||
optgroup = page->new_optgroup(L("Tool change parameters with multi extruder MM printers"), "param_toolchange_multi_extruder");
|
||||
optgroup->append_single_option_line("filament_multitool_ramming");
|
||||
optgroup->append_single_option_line("filament_multitool_ramming_volume");
|
||||
optgroup->append_single_option_line("filament_multitool_ramming_flow");
|
||||
@ -3909,7 +3915,7 @@ void TabPrinter::build_fff()
|
||||
|
||||
const int gcode_field_height = 15; // 150
|
||||
const int notes_field_height = 25; // 250
|
||||
page = add_options_page(L("Machine gcode"), "custom-gcode_gcode"); // ORCA: icon only visible on placeholders
|
||||
page = add_options_page(L("Machine G-code"), "custom-gcode_gcode"); // ORCA: icon only visible on placeholders
|
||||
optgroup = page->new_optgroup(L("Machine start G-code"), L"param_gcode", 0);
|
||||
optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
|
||||
validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
|
||||
@ -5770,7 +5776,7 @@ void Tab::delete_preset()
|
||||
presets += "\n - " + preset2.name;
|
||||
}
|
||||
if (count > 0) {
|
||||
msg = _L("Presets inherited by other presets can not be deleted!");
|
||||
msg = _L("Presets inherited by other presets cannot be deleted!");
|
||||
msg += "\n";
|
||||
msg += _L_PLURAL("The following presets inherit this preset.",
|
||||
"The following preset inherits this preset.", count);
|
||||
|
||||
@ -451,7 +451,7 @@ wxBitmap create_scaled_bitmap( const std::string& bmp_name_in,
|
||||
#endif
|
||||
Slic3r::GUI::wxGetApp().dark_mode();
|
||||
|
||||
// Try loading an SVG first, then PNG if SVG is not found:
|
||||
// Try loading an SVG first, then PNG if SVG was not found:
|
||||
wxBitmap *bmp = cache.load_svg(bmp_name, width, height, grayscale, dark_mode, new_color, resize ? em_unit(win) * 0.1f : 0.f);
|
||||
if (bmp == nullptr) {
|
||||
bmp = cache.load_png(bmp_name, width, height, grayscale, resize ? win->FromDIP(10) * 0.1f : 0.f);
|
||||
|
||||
@ -81,7 +81,7 @@ bool AstroBox::test(wxString &msg) const
|
||||
|
||||
wxString AstroBox::get_test_ok_msg () const
|
||||
{
|
||||
return _(L("Connection to AstroBox works correctly."));
|
||||
return _(L("Connection to AstroBox is working correctly."));
|
||||
}
|
||||
|
||||
wxString AstroBox::get_test_failed_msg (wxString &msg) const
|
||||
@ -89,7 +89,7 @@ wxString AstroBox::get_test_failed_msg (wxString &msg) const
|
||||
return GUI::from_u8((boost::format("%s: %s\n\n%s")
|
||||
% _utf8(L("Could not connect to AstroBox"))
|
||||
% std::string(msg.ToUTF8())
|
||||
% _utf8(L("Note: AstroBox version at least 1.1.0 is required."))).str());
|
||||
% _utf8(L("Note: AstroBox version 1.1.0 or higher is required."))).str());
|
||||
}
|
||||
|
||||
bool AstroBox::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const
|
||||
|
||||
@ -44,7 +44,7 @@ bool Duet::test(wxString &msg) const
|
||||
|
||||
wxString Duet::get_test_ok_msg () const
|
||||
{
|
||||
return _(L("Connection to Duet works correctly."));
|
||||
return _(L("Connection to Duet is working correctly."));
|
||||
}
|
||||
|
||||
wxString Duet::get_test_failed_msg (wxString &msg) const
|
||||
|
||||
@ -55,7 +55,7 @@ bool ESP3D::test(wxString& msg) const
|
||||
return ret;
|
||||
}
|
||||
|
||||
wxString ESP3D::get_test_ok_msg() const { return _(L("Connection to ESP3D works correctly.")); }
|
||||
wxString ESP3D::get_test_ok_msg() const { return _(L("Connection to ESP3D is working correctly.")); }
|
||||
|
||||
wxString ESP3D::get_test_failed_msg(wxString& msg) const
|
||||
{
|
||||
|
||||
@ -332,7 +332,7 @@ namespace Slic3r {
|
||||
|
||||
wxString ElegooLink::get_test_ok_msg() const
|
||||
{
|
||||
return _L("Connection to ElegooLink works correctly.");
|
||||
return _L("Connection to ElegooLink is working correctly.");
|
||||
}
|
||||
|
||||
wxString ElegooLink::get_test_failed_msg(wxString& msg) const
|
||||
|
||||
@ -65,7 +65,7 @@ bool FlashAir::test(wxString &msg) const
|
||||
|
||||
wxString FlashAir::get_test_ok_msg () const
|
||||
{
|
||||
return _(L("Connection to FlashAir works correctly and upload is enabled."));
|
||||
return _(L("Connection to FlashAir is working correctly and upload is enabled."));
|
||||
}
|
||||
|
||||
wxString FlashAir::get_test_failed_msg (wxString &msg) const
|
||||
|
||||
@ -58,7 +58,7 @@ bool Flashforge::test(wxString& msg) const
|
||||
return res;
|
||||
}
|
||||
|
||||
wxString Flashforge::get_test_ok_msg() const { return _(L("Serial connection to Flashforge works correctly.")); }
|
||||
wxString Flashforge::get_test_ok_msg() const { return _(L("Serial connection to Flashforge is working correctly.")); }
|
||||
|
||||
wxString Flashforge::get_test_failed_msg(wxString& msg) const
|
||||
{
|
||||
|
||||
@ -54,7 +54,7 @@ bool MKS::test(wxString& msg) const
|
||||
|
||||
wxString MKS::get_test_ok_msg() const
|
||||
{
|
||||
return _(L("Connection to MKS works correctly."));
|
||||
return _(L("Connection to MKS is working correctly."));
|
||||
}
|
||||
|
||||
wxString MKS::get_test_failed_msg(wxString& msg) const
|
||||
|
||||
@ -290,7 +290,7 @@ bool OctoPrint::test(wxString& msg) const
|
||||
|
||||
wxString OctoPrint::get_test_ok_msg () const
|
||||
{
|
||||
return _(L("Connection to OctoPrint works correctly."));
|
||||
return _(L("Connection to OctoPrint is working correctly."));
|
||||
}
|
||||
|
||||
wxString OctoPrint::get_test_failed_msg (wxString &msg) const
|
||||
@ -298,7 +298,7 @@ wxString OctoPrint::get_test_failed_msg (wxString &msg) const
|
||||
return GUI::format_wxstr("%s: %s\n\n%s"
|
||||
, _L("Could not connect to OctoPrint")
|
||||
, msg
|
||||
, _L("Note: OctoPrint version at least 1.1.0 is required."));
|
||||
, _L("Note: OctoPrint version 1.1.0 or higher is required."));
|
||||
}
|
||||
|
||||
bool OctoPrint::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const
|
||||
@ -554,7 +554,7 @@ const char* SL1Host::get_name() const { return "SL1Host"; }
|
||||
|
||||
wxString SL1Host::get_test_ok_msg () const
|
||||
{
|
||||
return _(L("Connection to Prusa SL1 / SL1S works correctly."));
|
||||
return _(L("Connection to Prusa SL1 / SL1S is working correctly."));
|
||||
}
|
||||
|
||||
wxString SL1Host::get_test_failed_msg (wxString &msg) const
|
||||
@ -581,7 +581,7 @@ const char* PrusaLink::get_name() const { return "PrusaLink"; }
|
||||
|
||||
wxString PrusaLink::get_test_ok_msg() const
|
||||
{
|
||||
return _(L("Connection to PrusaLink works correctly."));
|
||||
return _(L("Connection to PrusaLink is working correctly."));
|
||||
}
|
||||
|
||||
wxString PrusaLink::get_test_failed_msg(wxString& msg) const
|
||||
@ -1176,7 +1176,7 @@ void PrusaConnect::set_http_post_header_args(Http& http, PrintHostPostUploadActi
|
||||
|
||||
wxString PrusaConnect::get_test_ok_msg() const
|
||||
{
|
||||
return _(L("Connection to Prusa Connect works correctly."));
|
||||
return _(L("Connection to Prusa Connect is working correctly."));
|
||||
}
|
||||
|
||||
wxString PrusaConnect::get_test_failed_msg(wxString& msg) const
|
||||
|
||||
@ -5,32 +5,32 @@
|
||||
#endif
|
||||
|
||||
namespace ProfileDescrption {
|
||||
const std::string PROFILE_DESCRIPTION_0 = _L("It has a small layer height, and results in almost negligible layer lines and high printing quality. It is suitable for most general printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_1 = _L("Compared with the default profile of a 0.2 mm nozzle, it has lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in much higher printing quality, but a much longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_2 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a slightly bigger layer height, and results in almost negligible layer lines, and slightly shorter printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_3 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a bigger layer height, and results in slightly visible layer lines, but shorter printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_4 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer height, and results in almost invisible layer lines and higher printing quality, but shorter printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_5 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost invisible layer lines and much higher printing quality, but much longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_6 = _L("Compared with the default profile of 0.2 mm nozzle, it has a smaller layer height, and results in minimal layer lines and higher printing quality, but shorter printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_7 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in minimal layer lines and much higher printing quality, but much longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_8 = _L("It has a general layer height, and results in general layer lines and printing quality. It is suitable for most general printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_9 = _L("Compared with the default profile of a 0.4 mm nozzle, it has more wall loops and a higher sparse infill density. So, it results in higher strength of the prints, but more filament consumption and longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_10 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a bigger layer height, and results in more apparent layer lines and lower printing quality, but slightly shorter printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_11 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a bigger layer height, and results in more apparent layer lines and lower printing quality, but shorter printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_12 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, and results in less apparent layer lines and higher printing quality, but longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_13 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in less apparent layer lines and much higher printing quality, but much longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_14 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, and results in almost negligible layer lines and higher printing quality, but longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_15 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost negligible layer lines and much higher printing quality, but much longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_16 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, and results in almost negligible layer lines and longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_17 = _L("It has a big layer height, and results in apparent layer lines and ordinary printing quality and printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_18 = _L("Compared with the default profile of a 0.6 mm nozzle, it has more wall loops and a higher sparse infill density. So, it results in higher strength of the prints, but more filament consumption and longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_19 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a bigger layer height, and results in more apparent layer lines and lower printing quality, but shorter printing time in some printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_20 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a bigger layer height, and results in much more apparent layer lines and much lower printing quality, but shorter printing time in some printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_21 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a smaller layer height, and results in less apparent layer lines and slight higher printing quality, but longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_22 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a smaller layer height, and results in less apparent layer lines and higher printing quality, but longer printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_23 = _L("It has a very big layer height, and results in very apparent layer lines, low printing quality and general printing time.");
|
||||
const std::string PROFILE_DESCRIPTION_24 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a bigger layer height, and results in very apparent layer lines and much lower printing quality, but shorter printing time in some printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_25 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a much bigger layer height, and results in extremely apparent layer lines and much lower printing quality, but much shorter printing time in some printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_26 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a slightly smaller layer height, and results in slightly less but still apparent layer lines and slightly higher printing quality, but longer printing time in some printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_27 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a smaller layer height, and results in less but still apparent layer lines and slightly higher printing quality, but longer printing time in some printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_0 = _L("It has a small layer height. This results in almost negligible layer lines and high print quality. It is suitable for most printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_1 = _L("Compared with the default profile of a 0.2 mm nozzle, it has lower speeds and acceleration, and the sparse infill pattern is Gyroid. This results in much higher print quality but a much longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_2 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a slightly bigger layer height. This results in almost negligible layer lines and slightly shorter print time.");
|
||||
const std::string PROFILE_DESCRIPTION_3 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a bigger layer height. This results in slightly visible layer lines but shorter print time.");
|
||||
const std::string PROFILE_DESCRIPTION_4 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer height. This results in almost invisible layer lines and higher print quality but longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_5 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. This results in almost invisible layer lines and much higher print quality but much longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_6 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer height. This results in minimal layer lines and higher print quality but longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_7 = _L("Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. This results in minimal layer lines and much higher print quality but much longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_8 = _L("It has a normal layer height. This results in average layer lines and print quality. It is suitable for most printing cases.");
|
||||
const std::string PROFILE_DESCRIPTION_9 = _L("Compared with the default profile of a 0.4 mm nozzle, it has more wall loops and a higher sparse infill density. This results in higher print strength but more filament consumption and longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_10 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a bigger layer height. This results in more apparent layer lines and lower print quality, but slightly shorter print time.");
|
||||
const std::string PROFILE_DESCRIPTION_11 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a bigger layer height. This results in more apparent layer lines and lower print quality, but shorter print time.");
|
||||
const std::string PROFILE_DESCRIPTION_12 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height. This results in less apparent layer lines and higher print quality but longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_13 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. This results in less apparent layer lines and much higher print quality but much longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_14 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height. This results in almost negligible layer lines and higher print quality but longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_15 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. This results in almost negligible layer lines and much higher print quality but much longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_16 = _L("Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height. This results in almost negligible layer lines and longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_17 = _L("It has a big layer height. This results in apparent layer lines and ordinary print quality and print time.");
|
||||
const std::string PROFILE_DESCRIPTION_18 = _L("Compared with the default profile of a 0.6 mm nozzle, it has more wall loops and a higher sparse infill density. This results in higher print strength but more filament consumption and longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_19 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a bigger layer height. This results in more apparent layer lines and lower print quality, but shorter print time in some cases.");
|
||||
const std::string PROFILE_DESCRIPTION_20 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a bigger layer height. This results in much more apparent layer lines and much lower print quality, but shorter print time in some cases.");
|
||||
const std::string PROFILE_DESCRIPTION_21 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a smaller layer height. This results in less apparent layer lines and slight higher print quality but longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_22 = _L("Compared with the default profile of a 0.6 mm nozzle, it has a smaller layer height. This results in less apparent layer lines and higher print quality but longer print time.");
|
||||
const std::string PROFILE_DESCRIPTION_23 = _L("It has a very big layer height. This results in very apparent layer lines, low print quality and shorter print time.");
|
||||
const std::string PROFILE_DESCRIPTION_24 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a bigger layer height. This results in very apparent layer lines and much lower print quality, but shorter print time in some cases.");
|
||||
const std::string PROFILE_DESCRIPTION_25 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a much bigger layer height. This results in extremely apparent layer lines and much lower print quality, but much shorter print time in some cases.");
|
||||
const std::string PROFILE_DESCRIPTION_26 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a slightly smaller layer height. This results in slightly less but still apparent layer lines and slightly higher print quality but longer print time in some cases.");
|
||||
const std::string PROFILE_DESCRIPTION_27 = _L("Compared with the default profile of a 0.8 mm nozzle, it has a smaller layer height. This results in less but still apparent layer lines and slightly higher print quality but longer print time in some cases.");
|
||||
}
|
||||
@ -100,7 +100,7 @@ bool Repetier::test(wxString &msg) const
|
||||
|
||||
wxString Repetier::get_test_ok_msg () const
|
||||
{
|
||||
return _(L("Connection to Repetier works correctly."));
|
||||
return _(L("Connection to Repetier is working correctly."));
|
||||
}
|
||||
|
||||
wxString Repetier::get_test_failed_msg (wxString &msg) const
|
||||
@ -108,7 +108,7 @@ wxString Repetier::get_test_failed_msg (wxString &msg) const
|
||||
return GUI::from_u8((boost::format("%s: %s\n\n%s")
|
||||
% _utf8(L("Could not connect to Repetier"))
|
||||
% std::string(msg.ToUTF8())
|
||||
% _utf8(L("Note: Repetier version at least 0.90.0 is required."))).str());
|
||||
% _utf8(L("Note: Repetier version 0.90.0 ir higher is required."))).str());
|
||||
}
|
||||
|
||||
bool Repetier::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user