viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix the spacing on the original english strings (#9596)

Browse Source 
* Remove extra spaces between words

* Remove extra spaces after punctuation

* Remove extra spaces before punctuation

* Always needs a space after punctuation

* Always needs a space before parens

* Remove trailing spaces before newline
This commit is contained in:
Alexandre Folle de Menezes
2025-05-16 05:31:58 -03:00
committed by GitHub
parent 020d31d600
commit 57a6f61349
54 changed files with 3911 additions and 3999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
src/libslic3r/PrintConfig.cpp
View File

@@ -900,11 +900,11 @@ void PrintConfigDef::init_fff_params()
"2. Top and Bottom surfaces: Applies gap fill to top and bottom surfaces only, balancing print speed, "
"reducing potential over extrusion in the solid infill and making sure the top and bottom surfaces have "
"no pin hole gaps\n"
"3. Nowhere: Disables gap fill for all solid infill areas. \n\n"
"3. Nowhere: Disables gap fill for all solid infill areas.\n\n"
"Note that if using the classic perimeter generator, gap fill may also be generated between perimeters, "
"if a full width line cannot fit between them. That perimeter gap fill is not controlled by this setting. \n\n"
"if a full width line cannot fit between them. That perimeter gap fill is not controlled by this setting.\n\n"
"If you would like all gap fill, including the classic perimeter generated one, removed, "
"set the filter out tiny gaps value to a large number, like 999999. \n\n"
"set the filter out tiny gaps value to a large number, like 999999.\n\n"
"However this is not advised, as gap fill between perimeters is contributing to the model's strength. "
"For models where excessive gap fill is generated between perimeters, a better option would be to "
"switch to the arachne wall generator and use this option to control whether the cosmetic top and "
@@ -998,13 +998,13 @@ void PrintConfigDef::init_fff_params()
def->max = 100;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionPercent(100));
def = this->add("internal_bridge_density", coPercent);
def->label = L("Internal bridge density");
def->category = L("Strength");
def->tooltip = L("Controls the density (spacing) of internal bridge lines. 100% means solid bridge. Default is 100%.\n\n "
def->tooltip = L("Controls the density (spacing) of internal bridge lines. 100% means solid bridge. Default is 100%.\n\n"
"Lower density internal bridges can help reduce top surface pillowing and improve internal bridge reliability as there is more space for "
"air to circulate around the extruded bridge, improving its cooling speed. \n\n"
"air to circulate around the extruded bridge, improving its cooling speed.\n\n"
"This option works particularly well when combined with the second internal bridge over infill option, "
"further improving internal bridging structure before solid infill is extruded.");
def->sidetext = "%";
@@ -1016,8 +1016,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("bridge_flow", coFloat);
def->label = L("Bridge flow ratio");
def->category = L("Quality");
def->tooltip = L("Decrease this value slightly(for example 0.9) to reduce the amount of material for bridge, "
"to improve sag. \n\nThe actual bridge flow used is calculated by multiplying this value with the filament flow ratio, and if set, the object's flow ratio.");
def->tooltip = L("Decrease this value slightly (for example 0.9) to reduce the amount of material for bridge, to improve sag.\n\n"
"The actual bridge flow used is calculated by multiplying this value with the filament flow ratio, and if set, the object's flow ratio.");
def->min = 0;
def->max = 2.0;
def->mode = comAdvanced;
@@ -1037,8 +1037,8 @@ void PrintConfigDef::init_fff_params()
def->label = L("Top surface flow ratio");
def->category = L("Advanced");
def->tooltip = L("This factor affects the amount of material for top solid infill. "
"You can decrease it slightly to have smooth surface finish. "
"\n\nThe actual top surface flow used is calculated by multiplying this value with the filament flow ratio, and if set, the object's flow ratio.");
"You can decrease it slightly to have smooth surface finish.\n\n"
"The actual top surface flow used is calculated by multiplying this value with the filament flow ratio, and if set, the object's flow ratio.");
def->min = 0;
def->max = 2;
def->mode = comAdvanced;
@@ -1047,8 +1047,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("bottom_solid_infill_flow_ratio", coFloat);
def->label = L("Bottom surface flow ratio");
def->category = L("Advanced");
def->tooltip = L("This factor affects the amount of material for bottom solid infill. "
"\n\nThe actual bottom solid infill flow used is calculated by multiplying this value with the filament flow ratio, and if set, the object's flow ratio.");
def->tooltip = L("This factor affects the amount of material for bottom solid infill.\n\n"
"The actual bottom solid infill flow used is calculated by multiplying this value with the filament flow ratio, and if set, the object's flow ratio.");
def->min = 0;
def->max = 2;
def->mode = comAdvanced;
@@ -1103,12 +1103,17 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("Extrude perimeters that have a part over an overhang in the reverse direction on even layers. This alternating pattern can drastically improve steep overhangs.\n\nThis setting can also help reduce part warping due to the reduction of stresses in the part walls.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
def = this->add("overhang_reverse_internal_only", coBool);
def->label = L("Reverse only internal perimeters");
def->full_label = L("Reverse only internal perimeters");
def->category = L("Quality");
def->tooltip = L("Apply the reverse perimeters logic only on internal perimeters. \n\nThis setting greatly reduces part stresses as they are now distributed in alternating directions. This should reduce part warping while also maintaining external wall quality. This feature can be very useful for warp prone material, like ABS/ASA, and also for elastic filaments, like TPU and Silk PLA. It can also help reduce warping on floating regions over supports.\n\nFor this setting to be the most effective, it is recommended to set the Reverse Threshold to 0 so that all internal walls print in alternating directions on even layers irrespective of their overhang degree.");
def->tooltip = L("Apply the reverse perimeters logic only on internal perimeters.\n\n"
"This setting greatly reduces part stresses as they are now distributed in alternating directions. "
"This should reduce part warping while also maintaining external wall quality. "
"This feature can be very useful for warp prone material, like ABS/ASA, and also for elastic filaments, like TPU and Silk PLA. "
"It can also help reduce warping on floating regions over supports.\n\nFor this setting to be the most effective, "
"it is recommended to set the Reverse Threshold to 0 so that all internal walls print in alternating directions on even layers irrespective of their overhang degree.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
@@ -1226,10 +1231,10 @@ void PrintConfigDef::init_fff_params()
def = this->add("bridge_speed", coFloat);
def->label = L("External");
def->category = L("Speed");
def->tooltip = L("Speed of the externally visible bridge extrusions. "
"\n\nIn addition, if Slow down for curled perimeters is disabled or Classic overhang mode is enabled, "
"it will be the print speed of overhang walls that are supported by less than 13%, whether they are part of a bridge "
"or an overhang.");
def->tooltip = L("Speed of the externally visible bridge extrusions.\n\n"
"In addition, if Slow down for curled perimeters is disabled or Classic overhang mode is enabled, "
"it will be the print speed of overhang walls that are supported by less than 13%, "
"whether they are part of a bridge or an overhang.");
def->sidetext = L("mm/s");
def->min = 1;
def->mode = comAdvanced;
@@ -1298,8 +1303,9 @@ void PrintConfigDef::init_fff_params()
def = this->add("brim_ears_max_angle", coFloat);
def->label = L("Brim ear max angle");
def->category = L("Support");
def->tooltip = L("Maximum angle to let a brim ear appear. \nIf set to 0, no brim will be created. \nIf set to "
"~180, brim will be created on everything but straight sections.");
def->tooltip = L("Maximum angle to let a brim ear appear.\n"
"If set to 0, no brim will be created.\n"
"If set to ~180, brim will be created on everything but straight sections.");
def->sidetext = "°";
def->min = 0;
def->max = 180;
@@ -1515,8 +1521,9 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("This option can help reduce pillowing on top surfaces in heavily slanted or curved models.\n\n"
"By default, small internal bridges are filtered out and the internal solid infill is printed directly "
"over the sparse infill. This works well in most cases, speeding up printing without too much compromise "
"on top surface quality. \n\nHowever, in heavily slanted or curved models, especially where too low a sparse "
"infill density is used, this may result in curling of the unsupported solid infill, causing pillowing.\n\n"
"on top surface quality.\n\n"
"However, in heavily slanted or curved models, especially where too low a sparse infill density is used, "
"this may result in curling of the unsupported solid infill, causing pillowing.\n\n"
"Enabling limited filtering or no filtering will print internal bridge layer over slightly unsupported internal "
"solid infill. The options below control the sensitivity of the filtering, i.e. they control where internal bridges are "
"created.\n\n"
@@ -1678,7 +1685,16 @@ void PrintConfigDef::init_fff_params()
def = this->add("wall_sequence", coEnum);
def->label = L("Walls printing order");
def->category = L("Quality");
def->tooltip = L("Print sequence of the internal (inner) and external (outer) walls. \n\nUse Inner/Outer for best overhangs. This is because the overhanging walls can adhere to a neighbouring perimeter while printing. However, this option results in slightly reduced surface quality as the external perimeter is deformed by being squashed to the internal perimeter.\n\nUse Inner/Outer/Inner for the best external surface finish and dimensional accuracy as the external wall is printed undisturbed from an internal perimeter. However, overhang performance will reduce as there is no internal perimeter to print the external wall against. This option requires a minimum of 3 walls to be effective as it prints the internal walls from the 3rd perimeter onwards first, then the external perimeter and, finally, the first internal perimeter. This option is recommended against the Outer/Inner option in most cases. \n\nUse Outer/Inner for the same external wall quality and dimensional accuracy benefits of Inner/Outer/Inner option. However, the z seams will appear less consistent as the first extrusion of a new layer starts on a visible surface.\n\n ");
def->tooltip = L("Print sequence of the internal (inner) and external (outer) walls.\n\n"
"Use Inner/Outer for best overhangs. This is because the overhanging walls can adhere to a neighbouring perimeter while printing. "
"However, this option results in slightly reduced surface quality as the external perimeter is deformed by being squashed to the internal perimeter.\n\n"
"Use Inner/Outer/Inner for the best external surface finish and dimensional accuracy as the external wall is printed undisturbed from an internal perimeter. "
"However, overhang performance will reduce as there is no internal perimeter to print the external wall against. "
"This option requires a minimum of 3 walls to be effective as it prints the internal walls from the 3rd perimeter onwards first, "
"then the external perimeter and, finally, the first internal perimeter. "
"This option is recommended against the Outer/Inner option in most cases.\n\n"
"Use Outer/Inner for the same external wall quality and dimensional accuracy benefits of Inner/Outer/Inner option. "
"However, the z seams will appear less consistent as the first extrusion of a new layer starts on a visible surface.\n\n ");
def->enum_keys_map = &ConfigOptionEnum<WallSequence>::get_enum_values();
def->enum_values.push_back("inner wall/outer wall");
def->enum_values.push_back("outer wall/inner wall");
@@ -1847,7 +1863,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("pressure_advance", coFloats);
def->label = L("Pressure advance");
def->tooltip = L("Pressure advance(Klipper) AKA Linear advance factor(Marlin)");
def->tooltip = L("Pressure advance (Klipper) AKA Linear advance factor (Marlin).");
def->max = 2;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 0.02 });
@@ -1882,8 +1898,8 @@ void PrintConfigDef::init_fff_params()
"and no faster than the recommended maximum acceleration as given by the Klipper input shaper.\n"
"2. Take note of the optimal PA value for each volumetric flow speed and acceleration. You can find the flow number by selecting "
"flow from the color scheme drop down and move the horizontal slider over the PA pattern lines. The number should be visible "
"at the bottom of the page. The ideal PA value should be decreasing the higher the volumetric flow is. If it is not, confirm that your extruder is functioning correctly."
"The slower and with less acceleration you print, the larger the range of acceptable PA values. If no difference is visible, use the PA value from the faster test."
"at the bottom of the page. The ideal PA value should be decreasing the higher the volumetric flow is. If it is not, confirm that your extruder is functioning correctly. "
"The slower and with less acceleration you print, the larger the range of acceptable PA values. If no difference is visible, use the PA value from the faster test.\n"
"3. Enter the triplets of PA values, Flow and Accelerations in the text box here and save your filament profile\n\n"
"");
def->mode = comAdvanced;
@@ -1900,11 +1916,12 @@ void PrintConfigDef::init_fff_params()
"as if the PA profile is not set accurately, it will cause uniformity issues on the external surfaces before and after overhangs.\n");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBools{ false });
def = this->add("adaptive_pressure_advance_bridges", coFloats);
def->label = L("Pressure advance for bridges");
def->tooltip = L("Pressure advance value for bridges. Set to 0 to disable. \n\n A lower PA value when printing bridges helps reduce the appearance of slight under extrusion "
"immediately after bridges. This is caused by the pressure drop in the nozzle when printing in the air and a lower PA helps counteract this.");
def->tooltip = L("Pressure advance value for bridges. Set to 0 to disable.\n\n"
"A lower PA value when printing bridges helps reduce the appearance of slight under extrusion immediately after bridges. "
"This is caused by the pressure drop in the nozzle when printing in the air and a lower PA helps counteract this.");
def->max = 2;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloats { 0.0 });
@@ -2097,7 +2114,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("filament_unloading_speed", coFloats);
def->label = L("Unloading speed");
def->tooltip = L("Speed used for unloading the filament on the wipe tower (does not affect "
" initial part of unloading just after ramming).");
"initial part of unloading just after ramming).");
def->sidetext = L("mm/s");
def->min = 0;
def->mode = comAdvanced;
@@ -2411,10 +2428,11 @@ void PrintConfigDef::init_fff_params()
def->label = L("Sparse infill anchor length");
def->category = L("Strength");
def->tooltip = L("Connect an infill line to an internal perimeter with a short segment of an additional perimeter. "
"If expressed as percentage (example: 15%) it is calculated over infill extrusion width. Orca Slicer tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
"If expressed as percentage (example: 15%) it is calculated over infill extrusion width. "
"Orca Slicer tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
"shorter than infill_anchor_max is found, the infill line is connected to a perimeter segment at just one side "
"and the length of the perimeter segment taken is limited to this parameter, but no longer than anchor_length_max. "
"\nSet this parameter to zero to disable anchoring perimeters connected to a single infill line.");
"and the length of the perimeter segment taken is limited to this parameter, but no longer than anchor_length_max.\n"
"Set this parameter to zero to disable anchoring perimeters connected to a single infill line.");
def->sidetext = L("mm or %");
def->ratio_over = "sparse_infill_line_width";
def->max_literal = 1000;
@@ -2438,10 +2456,11 @@ void PrintConfigDef::init_fff_params()
def->label = L("Maximum length of the infill anchor");
def->category = L("Strength");
def->tooltip = L("Connect an infill line to an internal perimeter with a short segment of an additional perimeter. "
"If expressed as percentage (example: 15%) it is calculated over infill extrusion width. Orca Slicer tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
"If expressed as percentage (example: 15%) it is calculated over infill extrusion width. "
"Orca Slicer tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
"shorter than this parameter is found, the infill line is connected to a perimeter segment at just one side "
"and the length of the perimeter segment taken is limited to infill_anchor, but no longer than this parameter. "
"\nIf set to 0, the old algorithm for infill connection will be used, it should create the same result as with 1000 & 0.");
"and the length of the perimeter segment taken is limited to infill_anchor, but no longer than this parameter.\n"
"If set to 0, the old algorithm for infill connection will be used, it should create the same result as with 1000 & 0.");
def->sidetext = def_infill_anchor_min->sidetext;
def->ratio_over = def_infill_anchor_min->ratio_over;
def->gui_type = def_infill_anchor_min->gui_type;
@@ -2455,7 +2474,7 @@ void PrintConfigDef::init_fff_params()
def->enum_labels.push_back(L("1000 (unlimited)"));
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(20, false));
def = this->add("outer_wall_acceleration", coFloat);
def->label = L("Outer wall");
def->tooltip = L("Acceleration of outer walls");
@@ -2699,7 +2718,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("support_material_interface_fan_speed", coInts);
def->label = L("Support interface fan speed");
def->tooltip = L("This part cooling fan speed is applied when printing support interfaces. Setting this parameter to a higher than regular speed "
" reduces the layer binding strength between supports and the supported part, making them easier to separate."
"reduces the layer binding strength between supports and the supported part, making them easier to separate."
"\nSet to -1 to disable it."
"\nThis setting is overridden by disable_fan_first_layers.");
def->sidetext = "%";
@@ -2846,7 +2865,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("enable_arc_fitting", coBool);
def->label = L("Arc fitting");
def->tooltip = L("Enable this to get a G-code file which has G2 and G3 moves. "
"The fitting tolerance is same as the resolution. \n\n"
"The fitting tolerance is same as the resolution.\n\n"
"Note: For Klipper machines, this option is recommended to be disabled. Klipper does not benefit from "
"arc commands as these are split again into line segments by the firmware. This results in a reduction "
"in surface quality as line segments are converted to arcs by the slicer and then back to line segments "
@@ -3058,12 +3077,13 @@ void PrintConfigDef::init_fff_params()
"with original layer height.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
// Orca: max layer height for combined infill
def = this->add("infill_combination_max_layer_height", coFloatOrPercent);
def->label = L("Infill combination - Max layer height");
def->category = L("Strength");
def->tooltip = L("Maximum layer height for the combined sparse infill. \n\nSet it to 0 or 100% to use the nozzle diameter (for maximum reduction in print time) or a value of ~80% to maximize sparse infill strength.\n\n"
def->tooltip = L("Maximum layer height for the combined sparse infill.\n\n"
"Set it to 0 or 100% to use the nozzle diameter (for maximum reduction in print time) or a value of ~80% to maximize sparse infill strength.\n\n"
"The number of layers over which infill is combined is derived by dividing this value with the layer height and rounded down to the nearest decimal.\n\n"
"Use either absolute mm values (eg. 0.32mm for a 0.4mm nozzle) or % values (eg 80%). This value must not be larger "
"than the nozzle diameter.");
@@ -3071,7 +3091,7 @@ void PrintConfigDef::init_fff_params()
def->min = 0;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloatOrPercent(100., true));
def = this->add("sparse_infill_filament", coInt);
def->gui_type = ConfigOptionDef::GUIType::i_enum_open;
def->label = L("Infill");
@@ -3533,19 +3553,19 @@ void PrintConfigDef::init_fff_params()
def = this->add("max_volumetric_extrusion_rate_slope", coFloat);
def->label = L("Extrusion rate smoothing");
def->tooltip = L("This parameter smooths out sudden extrusion rate changes that happen when "
"the printer transitions from printing a high flow (high speed/larger width) "
"extrusion to a lower flow (lower speed/smaller width) extrusion and vice versa.\n\n"
"It defines the maximum rate by which the extruded volumetric flow in mm3/sec can change over time. "
"Higher values mean higher extrusion rate changes are allowed, resulting in faster speed transitions.\n\n"
"A value of 0 disables the feature. \n\n"
"For a high speed, high flow direct drive printer (like the Bambu lab or Voron) this value is usually not needed. "
"However it can provide some marginal benefit in certain cases where feature speeds vary greatly. For example, "
"when there are aggressive slowdowns due to overhangs. In these cases a high value of around 300-350mm3/s2 is "
"recommended as this allows for just enough smoothing to assist pressure advance achieve a smoother flow transition.\n\n"
"For slower printers without pressure advance, the value should be set much lower. A value of 10-15mm3/s2 is a "
"good starting point for direct drive extruders and 5-10mm3/s2 for Bowden style. \n\n"
"This feature is known as Pressure Equalizer in Prusa slicer.\n\n"
"Note: this parameter disables arc fitting.");
"the printer transitions from printing a high flow (high speed/larger width) "
"extrusion to a lower flow (lower speed/smaller width) extrusion and vice versa.\n\n"
"It defines the maximum rate by which the extruded volumetric flow in mm3/sec can change over time. "
"Higher values mean higher extrusion rate changes are allowed, resulting in faster speed transitions.\n\n"
"A value of 0 disables the feature.\n\n"
"For a high speed, high flow direct drive printer (like the Bambu lab or Voron) this value is usually not needed. "
"However it can provide some marginal benefit in certain cases where feature speeds vary greatly. For example, "
"when there are aggressive slowdowns due to overhangs. In these cases a high value of around 300-350mm3/s2 is "
"recommended as this allows for just enough smoothing to assist pressure advance achieve a smoother flow transition.\n\n"
"For slower printers without pressure advance, the value should be set much lower. "
"A value of 10-15mm3/s2 is a good starting point for direct drive extruders and 5-10mm3/s2 for Bowden style.\n\n"
"This feature is known as Pressure Equalizer in Prusa slicer.\n\n"
"Note: this parameter disables arc fitting.");
def->sidetext = L("mm³/s²");
def->min = 0;
def->mode = comAdvanced;
@@ -3709,7 +3729,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Extra loading distance");
def->tooltip = L("When set to zero, the distance the filament is moved from parking position during load "
"is exactly the same as it was moved back during unload. When positive, it is loaded further, "
" if negative, the loading move is shorter than unloading.");
"if negative, the loading move is shorter than unloading.");
def->sidetext = L("mm");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(-2.));
@@ -3765,7 +3785,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("make_overhang_printable_hole_size", coFloat);
def->label = L("Make overhangs printable - Hole area");
def->category = L("Quality");
def->tooltip = L("Maximum area of a hole in the base of the model before it's filled by conical material."
def->tooltip = L("Maximum area of a hole in the base of the model before it's filled by conical material. "
"A value of 0 will fill all the holes in the model base.");
def->sidetext = L("mm²");
def->mode = comAdvanced;
@@ -3822,7 +3842,9 @@ void PrintConfigDef::init_fff_params()
def = this->add("alternate_extra_wall", coBool);
def->label = L("Alternate extra wall");
def->category = L("Strength");
def->tooltip = L("This setting adds an extra wall to every other layer. This way the infill gets wedged vertically between the walls, resulting in stronger prints. \n\nWhen this option is enabled, the ensure vertical shell thickness option needs to be disabled. \n\nUsing lightning infill together with this option is not recommended as there is limited infill to anchor the extra perimeters to.");
def->tooltip = L("This setting adds an extra wall to every other layer. This way the infill gets wedged vertically between the walls, resulting in stronger prints.\n\n"
"When this option is enabled, the ensure vertical shell thickness option needs to be disabled.\n\n"
"Using lightning infill together with this option is not recommended as there is limited infill to anchor the extra perimeters to.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
@@ -3968,15 +3990,15 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionInt {0});
def = this->add("long_retractions_when_cut", coBools);
def->label = L("Long retraction when cut(beta)");
def->tooltip = L("Experimental feature.Retracting and cutting off the filament at a longer distance during changes to minimize purge."
def->label = L("Long retraction when cut (beta)");
def->tooltip = L("Experimental feature: Retracting and cutting off the filament at a longer distance during changes to minimize purge. "
"While this reduces flush significantly, it may also raise the risk of nozzle clogs or other printing problems.");
def->mode = comDevelop;
def->set_default_value(new ConfigOptionBools {false});
def = this->add("retraction_distances_when_cut",coFloats);
def->label = L("Retraction distance when cut");
def->tooltip = L("Experimental feature.Retraction length before cutting off during filament change");
def->tooltip = L("Experimental feature: Retraction length before cutting off during filament change.");
def->mode = comDevelop;
def->min = 10;
def->max = 18;
@@ -4203,7 +4225,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Quality");
def->tooltip = L(
"This option sets the printing speed for scarf joints. It is recommended to print scarf joints at a slow speed (less than 100 "
"mm/s). It's also advisable to enable 'Extrusion rate smoothing' if the set speed varies significantly from the speed of the "
"mm/s). It's also advisable to enable 'Extrusion rate smoothing' if the set speed varies significantly from the speed of the "
"outer or inner walls. If the speed specified here is higher than the speed of the outer or inner walls, the printer will default "
"to the slower of the two speeds. When specified as a percentage (e.g., 80%), the speed is calculated based on the respective "
"outer or inner wall speed. The default value is set to 100%.");
@@ -4258,7 +4280,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("role_based_wipe_speed", coBool);
def->label = L("Role base wipe speed");
def->tooltip = L("The wipe speed is determined by the speed of the current extrusion role."
def->tooltip = L("The wipe speed is determined by the speed of the current extrusion role. "
"e.g. if a wipe action is executed immediately following an outer wall extrusion, the speed of the outer wall extrusion will be utilized for the wipe action.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true));
@@ -4268,22 +4290,22 @@ void PrintConfigDef::init_fff_params()
def->tooltip = L("To minimize the visibility of the seam in a closed loop extrusion, a small inward movement is executed before the extruder leaves the loop.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
def = this->add("wipe_before_external_loop", coBool);
def->label = L("Wipe before external loop");
def->tooltip = L("To minimize visibility of potential overextrusion at the start of an external perimeter when printing with "
"Outer/Inner or Inner/Outer/Inner wall print order, the de-retraction is performed slightly on the inside from the "
"start of the external perimeter. That way any potential over extrusion is hidden from the outside surface. \n\nThis "
"is useful when printing with Outer/Inner or Inner/Outer/Inner wall print order as in these modes it is more likely "
"start of the external perimeter. That way any potential over extrusion is hidden from the outside surface.\n\n"
"This is useful when printing with Outer/Inner or Inner/Outer/Inner wall print order as in these modes it is more likely "
"an external perimeter is printed immediately after a de-retraction move.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
def = this->add("wipe_speed", coFloatOrPercent);
def->label = L("Wipe speed");
def->tooltip = L("The wipe speed is determined by the speed setting specified in this configuration."
"If the value is expressed as a percentage (e.g. 80%), it will be calculated based on the travel speed setting above."
"The default value for this parameter is 80%");
def->tooltip = L("The wipe speed is determined by the speed setting specified in this configuration. "
"If the value is expressed as a percentage (e.g. 80%), it will be calculated based on the travel speed setting above. "
"The default value for this parameter is 80%.");
def->sidetext = L("mm/s or %");
def->ratio_over = "travel_speed";
def->min = 0;
@@ -4325,10 +4347,10 @@ void PrintConfigDef::init_fff_params()
def = this->add("draft_shield", coEnum);
def->label = L("Draft shield");
def->tooltip = L("A draft shield is useful to protect an ABS or ASA print from warping and detaching from print bed due to wind draft. "
"It is usually needed only with open frame printers, i.e. without an enclosure. \n\n"
"It is usually needed only with open frame printers, i.e. without an enclosure.\n\n"
"Enabled = skirt is as tall as the highest printed object. Otherwise 'Skirt height' is used.\n"
"Note: With the draft shield active, the skirt will be printed at skirt distance from the object. Therefore, if brims "
"are active it may intersect with them. To avoid this, increase the skirt distance value.\n");
"Note: With the draft shield active, the skirt will be printed at skirt distance from the object. "
"Therefore, if brims are active it may intersect with them. To avoid this, increase the skirt distance value.\n");
def->enum_keys_map = &ConfigOptionEnum<DraftShield>::get_enum_values();
def->enum_values.push_back("disabled");
def->enum_values.push_back("enabled");
@@ -4518,7 +4540,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("preheat_steps", coInt);
def->label = L("Preheat steps");
def->tooltip = L("Insert multiple preheat commands(e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1.");
def->tooltip = L("Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1.");
//def->sidetext = "";
def->min = 1;
def->max = 10;
@@ -4943,7 +4965,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("independent_support_layer_height", coBool);
def->label = L("Independent support layer height");
def->category = L("Support");
def->tooltip = L("Support layer uses layer height independent with object layer. This is to support customizing z-gap and save print time."
def->tooltip = L("Support layer uses layer height independent with object layer. This is to support customizing z-gap and save print time. "
"This option will be invalid when the prime tower is enabled.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true));
@@ -4972,7 +4994,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("tree_support_branch_angle", coFloat);
def->label = L("Tree support branch angle");
def->category = L("Support");
def->tooltip = L("This setting determines the maximum overhang angle that t he branches of tree support allowed to make."
def->tooltip = L("This setting determines the maximum overhang angle that the branches of tree support are allowed to make. "
"If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther.");
def->sidetext = "°";
def->min = 0;
@@ -4983,7 +5005,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("tree_support_branch_angle_organic", coFloat);
def->label = L("Tree support branch angle");
def->category = L("Support");
def->tooltip = L("This setting determines the maximum overhang angle that t he branches of tree support allowed to make."
def->tooltip = L("This setting determines the maximum overhang angle that the branches of tree support are allowed to make. "
"If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther.");
def->sidetext = "°";
def->min = 0;
@@ -5040,7 +5062,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("tree_support_adaptive_layer_height", coBool);
def->label = L("Adaptive layer height");
def->category = L("Quality");
def->tooltip = L("Enabling this option means the height of tree support layer except the first will be automatically calculated ");
def->tooltip = L("Enabling this option means the height of tree support layer except the first will be automatically calculated ");
def->set_default_value(new ConfigOptionBool(1));
def = this->add("tree_support_auto_brim", coBool);
@@ -5119,8 +5141,9 @@ void PrintConfigDef::init_fff_params()
def = this->add("activate_chamber_temp_control",coBools);
def->label = L("Activate temperature control");
def->tooltip = L("Enable this option for automated chamber temperature control. This option activates the emitting of an M191 command before the \"machine_start_gcode\"\n which sets the "
"chamber temperature and waits until it is reached. In addition, it emits an M141 command at the end of the print to turn off the chamber heater, if present. \n\n"
def->tooltip = L("Enable this option for automated chamber temperature control. "
"This option activates the emitting of an M191 command before the \"machine_start_gcode\"\n which sets the chamber temperature and waits until it is reached. "
"In addition, it emits an M141 command at the end of the print to turn off the chamber heater, if present.\n\n"
"This option relies on the firmware supporting the M191 and M141 commands either via macros or natively and is usually used when an active chamber heater is installed.");
def->mode = comSimple;
def->set_default_value(new ConfigOptionBools{false});
@@ -5272,7 +5295,10 @@ void PrintConfigDef::init_fff_params()
def = this->add("wipe_distance", coFloats);
def->label = L("Wipe Distance");
def->tooltip = L("Describe how long the nozzle will move along the last path when retracting. \n\nDepending on how long the wipe operation lasts, how fast and long the extruder/filament retraction settings are, a retraction move may be needed to retract the remaining filament. \n\nSetting a value in the retract amount before wipe setting below will perform any excess retraction before the wipe, else it will be performed after.");
def->tooltip = L("Describe how long the nozzle will move along the last path when retracting.\n\n"
"Depending on how long the wipe operation lasts, how fast and long the extruder/filament retraction settings are, "
"a retraction move may be needed to retract the remaining filament.\n\n"
"Setting a value in the retract amount before wipe setting below will perform any excess retraction before the wipe, else it will be performed after.");
def->sidetext = L("mm");
def->min = 0;
def->mode = comAdvanced;
@@ -5452,7 +5478,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("idle_temperature", coInts);
def->label = L("Idle temperature");
def->tooltip = L("Nozzle temperature when the tool is currently not used in multi-tool setups."
def->tooltip = L("Nozzle temperature when the tool is currently not used in multi-tool setups. "
"This is only used when 'Ooze prevention' is active in Print Settings. Set to 0 to disable.");
def->sidetext = "°C";
def->min = 0;
@@ -5534,10 +5560,10 @@ void PrintConfigDef::init_fff_params()
def = this->add("use_relative_e_distances", coBool);
def->label = L("Use relative E distances");
def->tooltip = L("Relative extrusion is recommended when using \"label_objects\" option."
def->tooltip = L("Relative extrusion is recommended when using \"label_objects\" option. "
"Some extruders work better with this option unchecked (absolute extrusion mode). "
"Wipe tower is only compatible with relative mode. It is recommended on "
"most printers. Default is checked");
"most printers. Default is checked.");
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true));

4
src/slic3r/GUI/AMSSetting.cpp
View File

@@ -67,7 +67,7 @@ void AMSSetting::create()
// tip line2
m_tip_Insert_material_line2 = new Label(m_panel_Insert_material,
_L("Note: if a new filament is inserted during printing, the AMS will not automatically read any information until printing is completed.")
_L("Note: if a new filament is inserted during printing, the AMS will not automatically read any information until printing is completed.")
);
m_tip_Insert_material_line2->SetFont(::Label::Body_13);
m_tip_Insert_material_line2->SetForegroundColour(AMS_SETTING_GREY700);
@@ -114,7 +114,7 @@ void AMSSetting::create()
m_sizer_starting_tip_inline = new wxBoxSizer(wxVERTICAL);
m_tip_starting_line1 = new Label(m_panel_body,
_L("The AMS will automatically read the information of inserted filament on start-up. It will take about 1 minute.The reading process will roll filament spools.")
_L("The AMS will automatically read the information of inserted filament on start-up. It will take about 1 minute. The reading process will roll the filament spools.")
);
m_tip_starting_line1->SetFont(::Label::Body_13);
m_tip_starting_line1->SetForegroundColour(AMS_SETTING_GREY700);

7
src/slic3r/GUI/AmsMappingPopup.cpp
View File

@@ -913,7 +913,9 @@ AmsHumidityTipPopup::AmsHumidityTipPopup(wxWindow* parent)
humidity_level_list = new AmsHumidityLevelList(this);
curr_humidity_img = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("hum_level1_light", this, 132), wxDefaultPosition, wxSize(FromDIP(132), FromDIP(132)), 0);
m_staticText_note = new Label(this, _L("Please change the desiccant when it is too wet. The indicator may not represent accurately in following cases : when the lid is open or the desiccant pack is changed. it take hours to absorb the moisture, low temperatures also slow down the process."));
m_staticText_note = new Label(this, _L("Please change the desiccant when it is too wet. "
"The indicator may not represent accurately in following cases: when the lid is open or the desiccant pack is changed. "
"It take hours to absorb the moisture, and low temperatures also slow down the process."));
m_staticText_note->SetMinSize(wxSize(FromDIP(680), -1));
m_staticText_note->SetMaxSize(wxSize(FromDIP(680), -1));
m_staticText_note->Wrap(FromDIP(680));
@@ -1432,7 +1434,8 @@ void AmsReplaceMaterialDialog::update_machine_obj(MachineObject* obj)
label_txt->SetLabelText(_L("AMS filament backup is not enabled, please enable it in the AMS settings."));
}
else {
label_txt->SetLabelText(_L("If there are two identical filaments in AMS, AMS filament backup will be enabled. \n(Currently supporting automatic supply of consumables with the same brand, material type, and color)"));
label_txt->SetLabelText(_L("If there are two identical filaments in AMS, AMS filament backup will be enabled.\n"
"(Currently supporting automatic supply of consumables with the same brand, material type, and color)"));
}
label_txt->SetMinSize(wxSize(FromDIP(380), -1));

14
src/slic3r/GUI/BindDialog.cpp
View File

@@ -484,7 +484,9 @@ PingCodeBindDialog::~PingCodeBindDialog() {
m_link_Terms_title->Wrap(FromDIP(450));
m_link_Terms_title->SetForegroundColour(wxColour(0x009688));
m_link_Terms_title->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {
wxString txt = _L("Thank you for purchasing a Bambu Lab device.Before using your Bambu Lab device, please read the terms and conditions.By clicking to agree to use your Bambu Lab device, you agree to abide by the Privacy Policy and Terms of Use(collectively, the \"Terms\"). If you do not comply with or agree to the Bambu Lab Privacy Policy, please do not use Bambu Lab equipment and services.");
wxString txt = _L("Thank you for purchasing a Bambu Lab device. Before using your Bambu Lab device, please read the terms and conditions. "
"By clicking to agree to use your Bambu Lab device, you agree to abide by the Privacy Policy and Terms of Use (collectively, the \"Terms\"). "
"If you do not comply with or agree to the Bambu Lab Privacy Policy, please do not use Bambu Lab equipment and services.");
ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Terms and Conditions"), ConfirmBeforeSendDialog::ButtonStyle::ONLY_CONFIRM);
confirm_dlg.update_text(txt);
confirm_dlg.CenterOnParent();
@@ -545,7 +547,15 @@ PingCodeBindDialog::~PingCodeBindDialog() {
m_link_notice_title->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_HAND); });
m_link_notice_title->Bind(wxEVT_LEAVE_WINDOW, [this](auto& e) {SetCursor(wxCURSOR_ARROW); });
m_link_notice_title->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {
wxString txt = _L("In the 3D Printing community, we learn from each other's successes and failures to adjust our own slicing parameters and settings. %s follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training %s to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in Privacy Policy. We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.");
wxString txt = _L("In the 3D Printing community, we learn from each other's successes and failures to adjust "
"our own slicing parameters and settings. %s follows the same principle and uses machine "
"learning to improve its performance from the successes and failures of the vast number of "
"prints by our users. We are training %s to be smarter by feeding them the real-world data. "
"If you are willing, this service will access information from your error logs and usage "
"logs, which may include information described in Privacy Policy. We will not collect any "
"Personal Data by which an individual can be identified directly or indirectly, including "
"without limitation names, addresses, payment information, or phone numbers. By enabling "
"this service, you agree to these terms and the statement about Privacy Policy.");
ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Statement on User Experience Improvement Plan"), ConfirmBeforeSendDialog::ButtonStyle::ONLY_CONFIRM);
wxString model_id_text;

2
src/slic3r/GUI/CalibrationWizard.cpp
View File

@@ -663,7 +663,7 @@ void PressureAdvanceWizard::on_cali_start()
if (curr_obj->get_printer_series() != PrinterSeries::SERIES_X1 && curr_obj->pa_calib_tab.size() >= MAX_PA_HISTORY_RESULTS_NUMS) {
MessageDialog msg_dlg(nullptr, wxString::Format(_L("This machine type can only hold 16 history results per nozzle. "
"You can delete the existing historical results and then start calibration. "
"Or you can continue the calibration, but you cannot create new calibration historical results. \n"
"Or you can continue the calibration, but you cannot create new calibration historical results.\n"
"Do you still want to continue the calibration?"), MAX_PA_HISTORY_RESULTS_NUMS), wxEmptyString, wxICON_WARNING | wxYES | wxCANCEL);
if (msg_dlg.ShowModal() != wxID_YES) {
return;

2
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@@ -601,7 +601,7 @@ void CalibrationPresetPage::create_filament_list_panel(wxWindow* parent)
{
auto panel_sizer = new wxBoxSizer(wxVERTICAL);
m_filament_list_tips = new Label(parent, _L("Tips for calibration material: \n- Materials that can share same hot bed temperature\n- Different filament brand and family(Brand = Bambu, Family = Basic, Matte)"));
m_filament_list_tips = new Label(parent, _L("Tips for calibration material: \n- Materials that can share same hot bed temperature\n- Different filament brand and family (Brand = Bambu, Family = Basic, Matte)"));
m_filament_list_tips->Hide();
m_filament_list_tips->SetFont(Label::Body_13);
m_filament_list_tips->SetForegroundColour(wxColour(145, 145, 145));

7
src/slic3r/GUI/ConfigManipulation.cpp
View File

@@ -160,7 +160,8 @@ void ConfigManipulation::check_chamber_temperature(DynamicPrintConfig* config)
auto iter = recommend_temp_map.find(filament_type);
if (iter!=recommend_temp_map.end()) {
if (iter->second < config->option<ConfigOptionInts>("chamber_temperatures")->get_at(0)) {
wxString msg_text = wxString::Format(_L("Current chamber temperature is higher than the material's safe temperature,it may result in material softening and clogging.The maximum safe temperature for the material is %d"), iter->second);
wxString msg_text = wxString::Format(_L("Current chamber temperature is higher than the material's safe temperature, this may result in material softening and clogging. "
"The maximum safe temperature for the material is %d"), iter->second);
MessageDialog dialog(m_msg_dlg_parent, msg_text, "", wxICON_WARNING | wxOK);
is_msg_dlg_already_exist = true;
dialog.ShowModal();
@@ -325,7 +326,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con
wxString msg_text = _(L("Alternate extra wall does't work well when ensure vertical shell thickness is set to All."));
if (is_global_config)
msg_text += "\n\n" + _(L("Change these settings automatically? \n"
msg_text += "\n\n" + _(L("Change these settings automatically?\n"
"Yes - Change ensure vertical shell thickness to Moderate and enable alternate extra wall\n"
"No - Don't use alternate extra wall"));
@@ -877,7 +878,7 @@ int ConfigManipulation::show_spiral_mode_settings_dialog(bool is_object_config)
msg_text += _(L(" But machines with I3 structure will not generate timelapse videos."));
}
if (!is_object_config)
msg_text += "\n\n" + _(L("Change these settings automatically? \n"
msg_text += "\n\n" + _(L("Change these settings automatically?\n"
"Yes - Change these settings and enable spiral mode automatically\n"
"No - Give up using spiral mode this time"));

2
src/slic3r/GUI/ConnectPrinter.cpp
View File

@@ -6,7 +6,7 @@
namespace Slic3r { namespace GUI {
ConnectPrinterDialog::ConnectPrinterDialog(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style)
: DPIDialog(parent, id, _L("ConnectPrinter(LAN)"), pos, size, style)
: DPIDialog(parent, id, _L("Connect Printer (LAN)"), pos, size, style)
{
SetBackgroundColour(*wxWHITE);
this->SetSizeHints(wxDefaultSize, wxDefaultSize);

25
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@@ -1123,8 +1123,8 @@ wxBoxSizer *CreateFilamentPresetDialog::create_button_item()
PresetBundle *preset_bundle = wxGetApp().preset_bundle;
if (preset_bundle->filaments.is_alias_exist(filament_preset_name)) {
MessageDialog dlg(this,
wxString::Format(_L("The Filament name %s you created already exists. \nIf you continue creating, the preset created will be displayed with its "
"full name. Do you want to continue?"),
wxString::Format(_L("The Filament name %s you created already exists.\n"
"If you continue creating, the preset created will be displayed with its full name. Do you want to continue?"),
from_u8(filament_preset_name)),
wxString(SLIC3R_APP_FULL_NAME) + " - " + _L("Info"), wxYES_NO | wxYES_DEFAULT | wxCENTRE);
if (wxID_YES != dlg.ShowModal()) { return; }
@@ -1313,7 +1313,8 @@ void CreateFilamentPresetDialog::select_curr_radiobox(std::vector<std::pair<Radi
m_filament_preset_combobox->SetLabelColor(DEFAULT_PROMPT_TEXT_COLOUR);
}
} else if (curr_selected_type == m_create_type.base_filament_preset) {
m_filament_preset_text->SetLabel(_L("We would rename the presets as \"Vendor Type Serial @printer you selected\". \nTo add preset for more printers, Please go to printer selection"));
m_filament_preset_text->SetLabel(_L("We would rename the presets as \"Vendor Type Serial @printer you selected\".\n"
"To add preset for more printers, Please go to printer selection"));
m_filament_preset_combobox->Hide();
if (_L("Select Type") != m_filament_type_combobox->GetLabel()) {
@@ -3359,8 +3360,9 @@ CreatePresetSuccessfulDialog::CreatePresetSuccessfulDialog(wxWindow *parent, con
success_text = new wxStaticText(this, wxID_ANY, _L("Filament Created"));
wxString prompt_text = _L("Please go to filament setting to edit your presets if you need.\nPlease note that nozzle temperature, hot bed temperature, and maximum "
"volumetric speed has a significant impact on printing quality. Please set them carefully.");
wxString sync_text = sync_user_preset_need_enabled ? _L("\n\nOrca has detected that your user presets synchronization function is not enabled, which may result in unsuccessful Filament settings on "
"the Device page. \nClick \"Sync user presets\" to enable the synchronization function.") : "";
wxString sync_text = sync_user_preset_need_enabled ? _L("\n\nOrca has detected that your user presets synchronization function is not enabled, "
"which may result in unsuccessful Filament settings on the Device page.\n"
"Click \"Sync user presets\" to enable the synchronization function.") : "";
next_step_text = new wxStaticText(this, wxID_ANY, prompt_text + sync_text);
break;
}
@@ -3662,12 +3664,14 @@ wxBoxSizer *ExportConfigsDialog::create_export_config_item(wxWindow *parent)
radioBoxSizer->Add(create_radio_item(m_exprot_type.preset_bundle, parent, wxEmptyString, m_export_type_btns), 0, wxEXPAND | wxALL, 0);
radioBoxSizer->Add(0, 0, 0, wxTOP, FromDIP(6));
wxStaticText *static_export_printer_preset_bundle_text = new wxStaticText(parent, wxID_ANY, _L("Printer and all the filament&&process presets that belongs to the printer. \nCan be shared with others."), wxDefaultPosition, wxDefaultSize);
wxStaticText *static_export_printer_preset_bundle_text = new wxStaticText(parent, wxID_ANY, _L("Printer and all the filament&&process presets that belongs to the printer.\n"
"Can be shared with others."), wxDefaultPosition, wxDefaultSize);
static_export_printer_preset_bundle_text->SetFont(Label::Body_12);
static_export_printer_preset_bundle_text->SetForegroundColour(wxColour("#6B6B6B"));
radioBoxSizer->Add(static_export_printer_preset_bundle_text, 0, wxEXPAND | wxLEFT, FromDIP(22));
radioBoxSizer->Add(create_radio_item(m_exprot_type.filament_bundle, parent, wxEmptyString, m_export_type_btns), 0, wxEXPAND | wxTOP, FromDIP(10));
wxStaticText *static_export_filament_preset_bundle_text = new wxStaticText(parent, wxID_ANY, _L("User's filament preset set. \nCan be shared with others."), wxDefaultPosition, wxDefaultSize);
wxStaticText *static_export_filament_preset_bundle_text = new wxStaticText(parent, wxID_ANY, _L("User's filament preset set.\nCan be shared with others."),
wxDefaultPosition, wxDefaultSize);
static_export_filament_preset_bundle_text->SetFont(Label::Body_12);
static_export_filament_preset_bundle_text->SetForegroundColour(wxColour("#6B6B6B"));
radioBoxSizer->Add(static_export_filament_preset_bundle_text, 0, wxEXPAND | wxLEFT, FromDIP(22));
@@ -4553,7 +4557,8 @@ void EditFilamentPresetDialog::delete_preset()
}
wxString msg;
if (is_base_preset) {
msg = _L("Are you sure to delete the selected preset? \nIf the preset corresponds to a filament currently in use on your printer, please reset the filament information for that slot.");
msg = _L("Are you sure to delete the selected preset?\n"
"If the preset corresponds to a filament currently in use on your printer, please reset the filament information for that slot.");
} else {
msg = _L("Are you sure to delete the selected preset?");
}
@@ -4759,7 +4764,9 @@ wxBoxSizer *EditFilamentPresetDialog::create_button_sizer()
std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
m_del_filament_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent &e) {
WarningDialog dlg(this, _L("All the filament presets belong to this filament would be deleted. \nIf you are using this filament on your printer, please reset the filament information for that slot."), _L("Delete filament"), wxYES | wxCANCEL | wxCANCEL_DEFAULT | wxCENTRE);
WarningDialog dlg(this, _L("All the filament presets belong to this filament would be deleted.\n"
"If you are using this filament on your printer, please reset the filament information for that slot."),
_L("Delete filament"), wxYES | wxCANCEL | wxCANCEL_DEFAULT | wxCENTRE);
int res = dlg.ShowModal();
if (wxID_YES == res) {
PresetBundle *preset_bundle = wxGetApp().preset_bundle;

11
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -3088,7 +3088,8 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
if (jj.contains("errno")) {
if (jj["errno"].is_number()) {
if (jj["errno"].get<int>() == -2) {
wxString text = _L("The current chamber temperature or the target chamber temperature exceeds 45\u2103.In order to avoid extruder clogging,low temperature filament(PLA/PETG/TPU) is not allowed to be loaded.");
wxString text = _L("The current chamber temperature or the target chamber temperature exceeds 45\u2103. "
"In order to avoid extruder clogging, low temperature filament (PLA/PETG/TPU) is not allowed to be loaded.");
GUI::wxGetApp().push_notification(text);
}
}
@@ -3100,10 +3101,12 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
if (jj["errno"].is_number()) {
wxString text;
if (jj["errno"].get<int>() == -2) {
text = _L("Low temperature filament(PLA/PETG/TPU) is loaded in the extruder.In order to avoid extruder clogging,it is not allowed to set the chamber temperature above 45\u2103.");
text = _L("Low temperature filament (PLA/PETG/TPU) is loaded in the extruder. "
"In order to avoid extruder clogging, it is not allowed to set the chamber temperature above 45\u2103.");
}
else if (jj["errno"].get<int>() == -4) {
text = _L("When you set the chamber temperature below 40\u2103, the chamber temperature control will not be activated. And the target chamber temperature will automatically be set to 0\u2103.");
text = _L("When you set the chamber temperature below 40\u2103, the chamber temperature control will not be activated. "
"And the target chamber temperature will automatically be set to 0\u2103.");
}
if(!text.empty()){
#if __WXOSX__
@@ -6132,7 +6135,7 @@ void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::st
{
{"TPU: not supported", _L("TPU is not supported by AMS.")},
{"Bambu PET-CF/PA6-CF: not supported", _L("Bambu PET-CF/PA6-CF is not supported by AMS.")},
{"PVA: flexible", _L("Damp PVA will become flexible and get stuck inside AMS,please take care to dry it before use.")},
{"PVA: flexible", _L("Damp PVA will become flexible and get stuck inside AMS, please take care to dry it before use.")},
{"CF/GF: hard and brittle", _L("CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution.")}
};

2
src/slic3r/GUI/GUI_App.cpp
View File

@@ -737,7 +737,7 @@ static void generic_exception_handle()
// and terminate the app so it is at least certain to happen now.
BOOST_LOG_TRIVIAL(error) << boost::format("std::bad_alloc exception: %1%") % ex.what();
flush_logs();
wxString errmsg = wxString::Format(_L("OrcaSlicer will terminate because of running out of memory."
wxString errmsg = wxString::Format(_L("OrcaSlicer will terminate because of running out of memory. "
"It may be a bug. It will be appreciated if you report the issue to our team."));
wxMessageBox(errmsg + "\n\n" + wxString(ex.what()), _L("Fatal error"), wxOK | wxICON_ERROR);

2
src/slic3r/GUI/GUI_Factories.cpp
View File

@@ -567,7 +567,7 @@ wxMenu* MenuFactory::append_submenu_add_handy_model(wxMenu* menu, ModelVolumeTyp
auto min_width_top_surface = m_config->option<ConfigOptionFloatOrPercent>("min_width_top_surface")->value;
if (is_only_one_wall_top && min_width_top_surface > 0) {
wxString msg_text = _L("This model features text embossment on the top surface. For optimal results, it is "
"advisable to set the 'One Wall Threshold(min_width_top_surface)' "
"advisable to set the 'One Wall Threshold (min_width_top_surface)' "
"to 0 for the 'Only One Wall on Top Surfaces' to work best.\n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me");

2
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@@ -2462,7 +2462,7 @@ bool ObjectList::del_from_cut_object(bool is_cut_connector, bool is_model_part/*
InfoDialog dialog(wxGetApp().plater(), title,
(_L("This action will break a cut correspondence.\n"
"After that model consistency can't be guaranteed .\n"
"After that model consistency can't be guaranteed.\n"
"\n"
"To manipulate with solid parts or negative volumes you have to invalidate cut information first.") + msg_end ),
false, buttons_style | wxCANCEL_DEFAULT | wxICON_WARNING);

2
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
View File

@@ -739,7 +739,7 @@ void GLGizmoBrimEars::on_render_input_window(float x, float y, float bottom_limi
ImColor HyperColor = ImGuiWrapper::COL_ORCA;
ImGui::PushStyleColor(ImGuiCol_Text, ImGuiWrapper::to_ImVec4(ColorRGB::WARNING()));
float parent_width = ImGui::GetContentRegionAvail().x;
m_imgui->text_wrapped(_L("Warning: The brim type is not set to \"painted\",the brim ears will not take effect !"), parent_width);
m_imgui->text_wrapped(_L("Warning: The brim type is not set to \"painted\", the brim ears will not take effect!"), parent_width);
ImGui::PopStyleColor();
ImGui::PushStyleColor(ImGuiCol_Text, HyperColor.Value);
ImGui::Dummy(ImVec2(font_size * 1.8, font_size * 1.3));

6
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@@ -1911,7 +1911,7 @@ void GLGizmoEmboss::draw_model_type()
void GLGizmoEmboss::draw_style_rename_popup() {
std::string& new_name = m_style_manager.get_style().name;
const std::string &old_name = m_style_manager.get_stored_style()->name;
std::string text_in_popup = GUI::format(_L("Rename style(%1%) for embossing text"), old_name) + ": ";
std::string text_in_popup = GUI::format(_L("Rename style (%1%) for embossing text"), old_name) + ": ";
ImGui::Text("%s", text_in_popup.c_str());
bool is_unique = (new_name == old_name) || // could be same as before rename
@@ -3116,8 +3116,8 @@ void GLGizmoEmboss::create_notification_not_valid_font(
}
const std::string &face_name = face_name_opt.value_or(face_name_by_wx.value_or(es.path));
std::string text =
GUI::format(_L("Can't load exactly same font(\"%1%\"). "
"Application selected a similar one(\"%2%\"). "
GUI::format(_L("Can't load exactly same font (\"%1%\"). "
"Application selected a similar one (\"%2%\"). "
"You have to specify font for enable edit text."),
face_name_3mf, face_name);
create_notification_not_valid_font(text);

6
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@@ -1902,14 +1902,14 @@ void GLGizmoMeasure::show_selection_ui()
if (m_selected_wrong_feature_waring_tip) {
if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY) {
if (m_assembly_mode == AssemblyMode::FACE_FACE) {
m_imgui->warning_text(_L("Warning:please select Plane's feature."));
m_imgui->warning_text(_L("Warning: please select Plane's feature."));
} else if (m_assembly_mode == AssemblyMode::POINT_POINT) {
m_imgui->warning_text(_L("Warning:please select Point's or Circle's feature."));
m_imgui->warning_text(_L("Warning: please select Point's or Circle's feature."));
}
}
}
if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY && m_hit_different_volumes.size() == 1) {
m_imgui->warning_text(_L("Warning:please select two different mesh."));
m_imgui->warning_text(_L("Warning: please select two different meshes."));
}
}

2
src/slic3r/GUI/KBShortcutsDialog.cpp
View File

@@ -290,7 +290,7 @@ void KBShortcutsDialog::fill_shortcuts()
Shortcuts object_list_shortcuts = {
{"1-9", L("Set extruder number for the objects and parts") },
{L("Del"), L("Delete objects, parts, modifiers ")},
{L("Del"), L("Delete objects, parts, modifiers")},
{L("Esc"), L("Deselect all")},
{ctrl + "C", L("Copy to clipboard")},
{ctrl + "V", L("Paste from clipboard")},

2
src/slic3r/GUI/MainFrame.cpp
View File

@@ -3921,7 +3921,7 @@ void MainFrame::update_side_preset_ui()
void MainFrame::on_select_default_preset(SimpleEvent& evt)
{
MessageDialog dialog(this,
_L("Do you want to synchronize your personal data from Bambu Cloud? \n"
_L("Do you want to synchronize your personal data from Bambu Cloud?\n"
"It contains the following information:\n"
"1. The Process presets\n"
"2. The Filament presets\n"

3
src/slic3r/GUI/MediaFilePanel.cpp
View File

@@ -577,7 +577,8 @@ void MediaFilePanel::doAction(size_t index, int action)
wxPostEvent(Slic3r::GUI::wxGetApp().plater(), SimpleEvent(EVT_PRINT_FROM_SDCARD_VIEW));
}
else {
MessageDialog dlg(this, _L("The .gcode.3mf file contains no G-code data.Please slice it with Orca Slicer and export a new .gcode.3mf file."), wxEmptyString, wxICON_WARNING | wxOK);
MessageDialog dlg(this, _L("The .gcode.3mf file contains no G-code data. Please slice it with Orca Slicer and export a new .gcode.3mf file."),
wxEmptyString, wxICON_WARNING | wxOK);
auto res = dlg.ShowModal();
}

2
src/slic3r/GUI/MsgDialog.cpp
View File

@@ -579,7 +579,7 @@ wxBoxSizer *Newer3mfVersionDialog::get_msg_sizer()
wxBoxSizer * horizontal_sizer = new wxBoxSizer(wxHORIZONTAL);
wxString msg_str;
if (file_version_newer) {
text1 = new wxStaticText(this, wxID_ANY, _L("The 3mf file version is in Beta and it is newer than the current OrcaSlicer version."));
text1 = new wxStaticText(this, wxID_ANY, _L("The 3mf file version is in Beta and it is newer than the current OrcaSlicer version."));
wxStaticText * text2 = new wxStaticText(this, wxID_ANY, _L("If you would like to try Orca Slicer Beta, you may click to"));
wxHyperlinkCtrl *github_link = new wxHyperlinkCtrl(this, wxID_ANY, _L("Download Beta Version"), "https://github.com/bambulab/BambuStudio/releases");
horizontal_sizer->Add(text2, 0, wxEXPAND, 0);

6
src/slic3r/GUI/NetworkTestDialog.cpp
View File

@@ -139,11 +139,11 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
grid_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);
StateColor btn_bg(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(wxColour(255,255,255), StateColor::Enabled));
btn_link = new Button(this, _L("Test OrcaSlicer(GitHub)"));
btn_link = new Button(this, _L("Test OrcaSlicer (GitHub)"));
btn_link->SetBackgroundColor(btn_bg);
grid_sizer->Add(btn_link, 0, wxEXPAND | wxALL, 5);
text_link_title = new wxStaticText(this, wxID_ANY, _L("Test OrcaSlicer(GitHub):"), wxDefaultPosition, wxDefaultSize, 0);
text_link_title = new wxStaticText(this, wxID_ANY, _L("Test OrcaSlicer (GitHub):"), wxDefaultPosition, wxDefaultSize, 0);
text_link_title->Wrap(-1);
grid_sizer->Add(text_link_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -151,7 +151,7 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
text_link_val->Wrap(-1);
grid_sizer->Add(text_link_val, 0, wxALL, 5);
btn_bing = new Button(this, _L("Test Bing.com"));
btn_bing = new Button(this, _L("Test bing.com"));
btn_bing->SetBackgroundColor(btn_bg);
grid_sizer->Add(btn_bing, 0, wxEXPAND | wxALL, 5);

3
src/slic3r/GUI/NotificationManager.cpp
View File

@@ -2932,7 +2932,8 @@ void NotificationManager::bbl_show_app_newversion_notification()
void NotificationManager::bbl_show_need_support_on_notification()
{
NotificationData data{NotificationType::BBLNeedSupportON, NotificationLevel::WarningNotificationLevel, 0,_u8L("Warning:") + "\n" + _u8L("Your model needs support ! Please make support material enable.")};
NotificationData data{NotificationType::BBLNeedSupportON, NotificationLevel::WarningNotificationLevel, 0,
_u8L("Warning:") + "\n" + _u8L("Your model needs support! Please enable support material.")};
for (std::unique_ptr<PopNotification> &notification : m_pop_notifications) {
if (notification->get_type() == NotificationType::BBLNeedSupportON) {

4
src/slic3r/GUI/ObjColorDialog.cpp
View File

@@ -722,7 +722,7 @@ void ObjColorPanel::deal_default_strategy()
{
deal_add_btn();
deal_approximate_match_btn();
m_warning_text->SetLabelText(_L("Note:The color has been selected, you can choose OK \n to continue or manually adjust it."));
m_warning_text->SetLabelText(_L("Note: The color has been selected, you can choose OK \nto continue or manually adjust it."));
}
void ObjColorPanel::deal_add_btn()
@@ -760,7 +760,7 @@ void ObjColorPanel::deal_add_btn()
}
if (is_exceed) {
deal_approximate_match_btn();
m_warning_text->SetLabelText(_L("Waring:The count of newly added and \n current extruders exceeds 16."));
m_warning_text->SetLabelText(_L("Warning: The count of newly added and \ncurrent extruders exceeds 16."));
}
m_is_add_filament = true;
}

8
src/slic3r/GUI/Plater.cpp
View File

@@ -3225,12 +3225,12 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
notification_manager->close_notification_of_type(NotificationType::ExportFinished);
notification_manager->push_notification(NotificationType::CustomNotification,
NotificationManager::NotificationLevel::RegularNotificationLevel,
format(_L("Successfully unmounted. The device %s(%s) can now be safely removed from the computer."), evt.data.first.name, evt.data.first.path)
format(_L("Successfully unmounted. The device %s (%s) can now be safely removed from the computer."), evt.data.first.name, evt.data.first.path)
);
} else {
notification_manager->push_notification(NotificationType::CustomNotification,
NotificationManager::NotificationLevel::ErrorNotificationLevel,
format(_L("Ejecting of device %s(%s) has failed."), evt.data.first.name, evt.data.first.path)
format(_L("Ejecting of device %s (%s) has failed."), evt.data.first.name, evt.data.first.path)
);
}
});
@@ -9291,7 +9291,7 @@ void Plater::import_model_id(wxString download_info)
}
msg = _L("downloading project ...");
msg = _L("downloading project...");
//target_path = wxStandardPaths::Get().GetTempDir().utf8_str().data();
@@ -14636,7 +14636,7 @@ 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). "
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";

4
src/slic3r/GUI/Preferences.cpp
View File

@@ -1230,11 +1230,11 @@ wxWindow* PreferencesDialog::create_general_page()
auto item_calc_in_long_retract = create_item_checkbox(_L("Flushing volumes: Auto-calculate every time when the filament is changed."), page, _L("If enabled, auto-calculate every time when filament is changed"), 50, "auto_calculate_when_filament_change");
auto item_remember_printer_config = create_item_checkbox(_L("Remember printer configuration"), page, _L("If enabled, Orca will remember and switch filament/process configuration for each printer automatically."), 50, "remember_printer_config");
auto item_step_mesh_setting = create_item_checkbox(_L("Show the step mesh parameter setting dialog."), page, _L("If enabled,a parameter settings dialog will appear during STEP file import."), 50, "enable_step_mesh_setting");
auto item_multi_machine = create_item_checkbox(_L("Multi-device Management(Take effect after restarting Orca)."), page, _L("With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices."), 50, "enable_multi_machine");
auto item_multi_machine = create_item_checkbox(_L("Multi-device Management (Take effect after restarting Orca Slicer)."), page, _L("With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices."), 50, "enable_multi_machine");
auto item_auto_arrange = create_item_checkbox(_L("Auto arrange plate after cloning"), page, _L("Auto arrange plate after object cloning"), 50, "auto_arrange");
auto title_presets = create_item_title(_L("Presets"), page, _L("Presets"));
auto title_network = create_item_title(_L("Network"), page, _L("Network"));
auto item_user_sync = create_item_checkbox(_L("Auto sync user presets(Printer/Filament/Process)"), page, _L("User Sync"), 50, "sync_user_preset");
auto item_user_sync = create_item_checkbox(_L("Auto sync user presets (Printer/Filament/Process)"), page, _L("User Sync"), 50, "sync_user_preset");
auto item_system_sync = create_item_checkbox(_L("Update built-in Presets automatically."), page, _L("System Sync"), 50, "sync_system_preset");
auto item_save_presets = create_item_button(_L("Clear my choice on the unsaved presets."), _L("Clear"), page, L"", _L("Clear my choice on the unsaved presets."), []() {
wxGetApp().app_config->set("save_preset_choise", "");

2
src/slic3r/GUI/PresetComboBoxes.cpp
View File

@@ -1103,7 +1103,7 @@ void PlaterPresetComboBox::update()
else if (m_type == Preset::TYPE_SLA_MATERIAL)
set_label_marker(Append(separator(L("Add/Remove materials")), *bmp), LABEL_ITEM_WIZARD_MATERIALS);
else {
set_label_marker(Append(separator(L("Select/Remove printers(system presets)")), *bmp), LABEL_ITEM_WIZARD_PRINTERS);
set_label_marker(Append(separator(L("Select/Remove printers (system presets)")), *bmp), LABEL_ITEM_WIZARD_PRINTERS);
set_label_marker(Append(separator(L("Create printer")), *bmp), LABEL_ITEM_WIZARD_ADD_PRINTERS);
}
}

2
src/slic3r/GUI/PublishDialog.cpp
View File

@@ -24,7 +24,7 @@ static wxString PUBLISH_STEP_STRING[STEP_COUNT] = {
_L("Jump to model publish web page")
};
static wxString NOTE_STRING = _L("Note: The preparation may takes several minutes. Please be patient.");
static wxString NOTE_STRING = _L("Note: The preparation may take several minutes. Please be patient.");
PublishDialog::PublishDialog(Plater *plater)
: DPIDialog(static_cast<wxWindow *>(wxGetApp().mainframe), wxID_ANY, _L("Publish"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)

8
src/slic3r/GUI/ReleaseNote.cpp
View File

@@ -102,7 +102,7 @@ void ReleaseNoteDialog::on_dpi_changed(const wxRect &suggested_rect)
void ReleaseNoteDialog::update_release_note(wxString release_note, std::string version)
{
m_text_up_info->SetLabel(wxString::Format(_L("version %s update information :"), version));
m_text_up_info->SetLabel(wxString::Format(_L("version %s update information:"), version));
wxBoxSizer * sizer_text_release_note = new wxBoxSizer(wxVERTICAL);
auto m_staticText_release_note = new ::Label(m_vebview_release_note, release_note, LB_AUTO_WRAP);
m_staticText_release_note->SetMinSize(wxSize(FromDIP(530), -1));
@@ -239,7 +239,7 @@ void UpdatePluginDialog::update_info(std::string json_path)
version = from_u8(version_str);
description = from_u8(description_str);
m_text_up_info->SetLabel(wxString::Format(_L("A new Network plug-in(%s) available, Do you want to install it?"), version));
m_text_up_info->SetLabel(wxString::Format(_L("A new Network plug-in (%s) available, Do you want to install it?"), version));
m_text_up_info->SetMinSize(wxSize(FromDIP(260), -1));
m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1));
wxBoxSizer* sizer_text_release_note = new wxBoxSizer(wxVERTICAL);
@@ -1090,14 +1090,14 @@ void PrintErrorDialog::init_button_list()
e.Skip();
});
init_button(RESUME_PRINTING_DEFECTS, _L("Resume Printing(defects acceptable)"));
init_button(RESUME_PRINTING_DEFECTS, _L("Resume Printing (defects acceptable)"));
m_button_list[RESUME_PRINTING_DEFECTS]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
post_event(wxCommandEvent(EVT_SECONDARY_CHECK_RESUME));
e.Skip();
});
init_button(RESUME_PRINTING_PROBELM_SOLVED, _L("Resume Printing(problem solved)"));
init_button(RESUME_PRINTING_PROBELM_SOLVED, _L("Resume Printing (problem solved)"));
m_button_list[RESUME_PRINTING_PROBELM_SOLVED]->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
post_event(wxCommandEvent(EVT_SECONDARY_CHECK_RESUME));
e.Skip();

2
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -2581,7 +2581,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
is_printing_block = true;
nozzle_diameter = wxString::Format("%.1f", obj_->nozzle_diameter).ToStdString();
wxString nozzle_in_preset = wxString::Format(_L("Printing high temperature material(%s material) with %s may cause nozzle damage"), filament_type, format_steel_name(obj_->nozzle_type));
wxString nozzle_in_preset = wxString::Format(_L("Printing high temperature material (%s material) with %s may cause nozzle damage"), filament_type, format_steel_name(obj_->nozzle_type));
confirm_text.push_back(ConfirmBeforeSendInfo(nozzle_in_preset, ConfirmBeforeSendInfo::InfoLevel::Warning));
}
}

4
src/slic3r/GUI/SendMultiMachinePage.cpp
View File

@@ -1314,8 +1314,8 @@ wxPanel* SendMultiMachinePage::create_page()
// add send option
wxBoxSizer* title_send_option = create_item_title(_L("Send Options"), main_page, "");
wxBoxSizer* max_printer_send = create_item_input(_L("Send to"), _L("printers at the same time.(It depends on how many devices can undergo heating at the same time.)"), main_page, "", "max_send");
wxBoxSizer* delay_time = create_item_input(_L("Wait"), _L("minute each batch.(It depends on how long it takes to complete the heating.)"), main_page, "", "sending_interval");
wxBoxSizer* max_printer_send = create_item_input(_L("Send to"), _L("printers at the same time. (It depends on how many devices can undergo heating at the same time.)"), main_page, "", "max_send");
wxBoxSizer* delay_time = create_item_input(_L("Wait"), _L("minute each batch. (It depends on how long it takes to complete the heating.)"), main_page, "", "sending_interval");
sizer->Add(title_send_option, 0, wxEXPAND, 0);
sizer->Add(max_printer_send, 0, wxLEFT, FromDIP(20));
sizer->AddSpacer(FromDIP(3));

2
src/slic3r/GUI/StatusPanel.cpp
View File

@@ -5063,7 +5063,7 @@ wxBoxSizer *ScoreDialog::get_main_sizer(const std::vector<std::pair<wxString, st
m_main_sizer->Add(m_line_top, 0, wxEXPAND, 0);
m_main_sizer->Add(0, 0, 0, wxTOP, FromDIP(32));
warning_text = new wxStaticText(this, wxID_ANY, _L("At least one successful print record of this print profile is required \nto give a positive rating(4 or 5stars)."));
warning_text = new wxStaticText(this, wxID_ANY, _L("At least one successful print record of this print profile is required \nto give a positive rating (4 or 5 stars)."));
warning_text->SetForegroundColour(*wxRED);
warning_text->SetFont(::Label::Body_13);

13
src/slic3r/GUI/Tab.cpp
View File

@@ -1558,7 +1558,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
m_config->opt_enum<SupportMaterialInterfacePattern>("support_interface_pattern") == SupportMaterialInterfacePattern::smipRectilinearInterlaced)) {
wxString msg_text = _L("When using support material for the support interface, We recommend the following settings:\n"
"0 top z distance, 0 interface spacing, interlaced rectilinear pattern and disable independent support layer height");
msg_text += "\n\n" + _L("Change these settings automatically? \n"
msg_text += "\n\n" + _L("Change these settings automatically?\n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me");
MessageDialog dialog(wxGetApp().plater(), msg_text, "Suggestion", wxICON_WARNING | wxYES | wxNO);
@@ -1613,7 +1613,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
} else {
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"));
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"));
dialog.SetButtonLabel(wxID_NO, _L("Ignore"));
@@ -1650,8 +1650,8 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
unsigned char activate = boost::any_cast<unsigned char>(value);
if (activate == 1) {
MessageDialog dialog(wxGetApp().plater(),
_L("Experimental feature: Retracting and cutting off the filament at a greater distance during filament changes to minimize flush."
"Although it can notably reduce flush, it may also elevate the risk of nozzle clogs or other printing complications."), "", wxICON_WARNING | wxOK);
_L("Experimental feature: Retracting and cutting off the filament at a greater distance during filament changes to minimize flush. "
"Although it can notably reduce flush, it may also elevate the risk of nozzle clogs or other printing complications."), "", wxICON_WARNING | wxOK);
dialog.ShowModal();
}
}
@@ -1660,8 +1660,9 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
unsigned char activate = boost::any_cast<unsigned char>(value);
if (activate == 1) {
MessageDialog dialog(wxGetApp().plater(),
_L("Experimental feature: Retracting and cutting off the filament at a greater distance during filament changes to minimize flush."
"Although it can notably reduce flush, it may also elevate the risk of nozzle clogs or other printing complications.Please use with the latest printer firmware."), "", wxICON_WARNING | wxOK);
_L("Experimental feature: Retracting and cutting off the filament at a greater distance during filament changes to minimize flush. "
"Although it can notably reduce flush, it may also elevate the risk of nozzle clogs or other printing complications. "
"Please use with the latest printer firmware."), "", wxICON_WARNING | wxOK);
dialog.ShowModal();
}
}

2
src/slic3r/GUI/wxMediaCtrl2.cpp
View File

@@ -186,7 +186,7 @@ void wxMediaCtrl2::Load(wxURI url)
if (!hasplugins) {
CallAfter([] {
wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video. (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Orca Slicer?)"), _L("Error"), wxOK);
wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video. (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Orca Slicer?)"), _L("Error"), wxOK);
});
m_error = 101;
wxMediaEvent event(wxEVT_MEDIA_STATECHANGED);