merge conflicts

This commit is contained in:
Henri van der Riet
2024-09-02 21:21:20 +02:00
parent e750727743
commit 5b0ddbd5f7
44 changed files with 492 additions and 495 deletions

View File

@@ -641,7 +641,7 @@ msgid "Angle"
msgstr ""
msgid ""
"Embeded\n"
"Embedded\n"
"depth"
msgstr ""
@@ -1101,11 +1101,11 @@ msgstr ""
msgid "Undefined stroke type"
msgstr ""
msgid "Path can't be healed from selfintersection and multiple points."
msgid "Path can't be healed from self-intersection and multiple points."
msgstr ""
msgid ""
"Final shape constains selfintersection or multiple points with same "
"Final shape contains self-intersection or multiple points with same "
"coordinate."
msgstr ""
@@ -1459,7 +1459,7 @@ msgid "Some presets are modified."
msgstr ""
msgid ""
"You can keep the modifield presets to the new project, discard or save "
"You can keep the modified presets to the new project, discard or save "
"changes as new presets."
msgstr ""
@@ -1539,7 +1539,7 @@ msgid "Orca Slicer GUI initialization failed"
msgstr ""
#, possible-boost-format
msgid "Fatal error, exception catched: %1%"
msgid "Fatal error, exception caught: %1%"
msgstr ""
msgid "Quality"
@@ -2031,7 +2031,7 @@ msgid ""
"After that model consistency can't be guaranteed .\n"
"\n"
"To manipulate with solid parts or negative volumes you have to invalidate "
"cut infornation first."
"cut information first."
msgstr ""
msgid "Delete all connectors"
@@ -2040,7 +2040,7 @@ msgstr ""
msgid "Deleting the last solid part is not allowed."
msgstr ""
msgid "The target object contains only one part and can not be splited."
msgid "The target object contains only one part and can not be split."
msgstr ""
msgid "Assembly"
@@ -2411,7 +2411,7 @@ msgid ""
"We can not do auto-arrange on these objects."
msgstr ""
msgid "No arrangable objects are selected."
msgid "No arrangeable objects are selected."
msgstr ""
msgid ""
@@ -3026,7 +3026,7 @@ msgstr ""
msgid "Successfully executed post-processing script"
msgstr ""
msgid "Unknown error occured during exporting G-code."
msgid "Unknown error occurred during exporting G-code."
msgstr ""
#, possible-boost-format
@@ -3442,7 +3442,7 @@ msgid ""
"Change these settings automatically? \n"
"Yes - Change ensure vertical shell thickness to Moderate and enable "
"alternate extra wall\n"
"No - Dont use alternate extra wall"
"No - Don't use alternate extra wall"
msgstr ""
msgid ""
@@ -4504,7 +4504,7 @@ msgstr ""
msgid "Show &G-code Window"
msgstr ""
msgid "Show g-code window in Previce scene"
msgid "Show g-code window in Preview scene"
msgstr ""
msgid "Show 3D Navigator"
@@ -4728,7 +4728,7 @@ msgstr ""
msgid "Printer camera is malfunctioning."
msgstr ""
msgid "Problem occured. Please update the printer firmware and try again."
msgid "Problem occurred. Please update the printer firmware and try again."
msgstr ""
msgid ""
@@ -4890,7 +4890,7 @@ msgstr ""
msgid "Delete file"
msgstr ""
msgid "Fetching model infomations ..."
msgid "Fetching model information..."
msgstr ""
msgid "Failed to fetch model information from printer."
@@ -5151,7 +5151,7 @@ msgstr ""
msgid "Get oss config failed."
msgstr ""
msgid "Upload Pictrues"
msgid "Upload Pictures"
msgstr ""
msgid "Number of images successfully uploaded"
@@ -6247,10 +6247,10 @@ msgstr ""
msgid "If enabled, useful hints are displayed at startup."
msgstr ""
msgid "Flushing volumes: Auto-calculate everytime the color changed."
msgid "Flushing volumes: Auto-calculate every time the color changed."
msgstr ""
msgid "If enabled, auto-calculate everytime the color changed."
msgid "If enabled, auto-calculate every time the color changed."
msgstr ""
msgid ""
@@ -6349,7 +6349,7 @@ msgstr ""
msgid "every"
msgstr ""
msgid "The peroid of backup in seconds."
msgid "The period of backup in seconds."
msgstr ""
msgid "Downloads"
@@ -6562,7 +6562,7 @@ msgstr ""
msgid "Jump to model publish web page"
msgstr ""
msgid "Note: The preparation may takes several minutes. Please be patiant."
msgid "Note: The preparation may takes several minutes. Please be patient."
msgstr ""
msgid "Publish"
@@ -6942,8 +6942,8 @@ msgstr ""
msgid ""
"Thank you for purchasing a Bambu Lab device.Before using your Bambu Lab "
"device, please read the termsand conditions.By clicking to agree to use your "
"Bambu Lab device, you agree to abide by the Privacy Policyand Terms of "
"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."
msgstr ""
@@ -7011,7 +7011,7 @@ msgid "Click to reset all settings to the last saved preset."
msgstr ""
msgid ""
"Prime tower is required for smooth timeplase. There may be flaws on the "
"Prime tower is required for smooth timelapse. There may be flaws on the "
"model without prime tower. Are you sure you want to disable prime tower?"
msgstr ""
@@ -7405,7 +7405,7 @@ msgstr ""
msgid "Jerk limitation"
msgstr ""
msgid "Single extruder multimaterial setup"
msgid "Single extruder multi-material setup"
msgstr ""
msgid "Number of extruders of the printer."
@@ -7424,11 +7424,11 @@ msgstr ""
msgid "Wipe tower"
msgstr ""
msgid "Single extruder multimaterial parameters"
msgid "Single extruder multi-material parameters"
msgstr ""
msgid ""
"This is a single extruder multimaterial printer, diameters of all extruders "
"This is a single extruder multi-material printer, diameters of all extruders "
"will be set to the new value. Do you want to proceed?"
msgstr ""
@@ -7794,7 +7794,7 @@ msgid "Flushing volumes for filament change"
msgstr ""
msgid ""
"Orca would re-calculate your flushing volumes everytime the filaments color "
"Orca would re-calculate your flushing volumes every time the filaments color "
"changed. You could disable the auto-calculate in Orca Slicer > Preferences"
msgstr ""
@@ -7839,7 +7839,7 @@ msgstr ""
msgid ""
"Missing BambuSource component registered for media playing! Please re-"
"install BambuStutio or seek after-sales help."
"install BambuStudio or seek after-sales help."
msgstr ""
msgid ""
@@ -8984,7 +8984,7 @@ msgid ""
"The number of bottom solid layers is increased when slicing if the thickness "
"calculated by bottom shell layers is thinner than this value. This can avoid "
"having too thin shell when layer height is small. 0 means that this setting "
"is disabled and thickness of bottom shell is absolutely determained by "
"is disabled and thickness of bottom shell is absolutely determined by "
"bottom shell layers"
msgstr ""
@@ -9051,7 +9051,7 @@ msgstr ""
#, possible-c-format
msgid ""
"Force cooling fan to be specific speed when overhang degree of printed part "
"exceeds this value. Expressed as percentage which indicides how much width "
"exceeds this value. Expressed as percentage which indicates how much width "
"of the line without support from lower layer. 0% means forcing cooling for "
"all outer wall no matter how much overhang degree"
msgstr ""
@@ -9193,7 +9193,7 @@ msgid ""
"Silk PLA. It can also help reduce warping on floating regions over "
"supports.\n"
"\n"
"For this setting to be the most effective, it is recomended to set the "
"For 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 odd layers irrespective of their overhang degree."
msgstr ""
@@ -9301,7 +9301,7 @@ msgstr ""
msgid ""
"This controls the generation of the brim at outer and/or inner side of "
"models. Auto means the brim width is analysed and calculated automatically."
"models. Auto means the brim width is analyzed and calculated automatically."
msgstr ""
msgid "Brim-object gap"
@@ -9331,7 +9331,7 @@ msgid "Brim ear detection radius"
msgstr ""
msgid ""
"The geometry will be decimated before dectecting sharp angles. This "
"The geometry will be decimated before detecting sharp angles. This "
"parameter indicates the minimum length of the deviation for the decimation.\n"
"0 to deactivate"
msgstr ""
@@ -9656,7 +9656,7 @@ msgid ""
"first, which works best in most cases.\n"
"\n"
"Printing infill first may help with extreme overhangs as the walls have the "
"neighbouring infill to adhere to. However, the infill will slighly push out "
"neighbouring infill to adhere to. However, the infill will slightly push out "
"the printed walls where it is attached to them, resulting in a worse "
"external surface finish. It can also cause the infill to shine through the "
"external surfaces of the part."
@@ -9673,7 +9673,7 @@ msgid ""
"odd is enabled. Set this to any option other than Auto will force the wall "
"direction regardless of the Reverse on odd.\n"
"\n"
"This option will be disabled if sprial vase mode is enabled."
"This option will be disabled if spiral vase mode is enabled."
msgstr ""
msgid "Counter clockwise"
@@ -9788,7 +9788,7 @@ msgid "Enable pressure advance"
msgstr ""
msgid ""
"Enable pressure advance, auto calibration result will be overwriten once "
"Enable pressure advance, auto calibration result will be overwritten once "
"enabled."
msgstr ""
@@ -9811,11 +9811,11 @@ msgid ""
"your printer's extrusion system depending on the volumetric flow speed and "
"acceleration it is printing at. Internally, it generates a fitted model that "
"can extrapolate the needed pressure advance for any given volumetric flow "
"speed and acceleration, which is then emmited to the printer depending on "
"speed and acceleration, which is then emitted to the printer depending on "
"the current print conditions.\n"
"\n"
"When enabled, the pressure advance value above is overriden. However, a "
"reasonable default value above is strongly recomended to act as a fallback "
"When enabled, the pressure advance value above is overridden. However, a "
"reasonable default value above is strongly recommended to act as a fallback "
"and for when tool changing.\n"
"\n"
msgstr ""
@@ -9839,7 +9839,7 @@ msgid ""
"feature print speed in your profile (usually its the sparse or solid "
"infill). Then run them for the same speeds for the slowest and fastest print "
"accelerations,and no faster than the recommended maximum acceleration as "
"given by the klipper input shaper.\n"
"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. "
@@ -9884,8 +9884,8 @@ msgid "Keep fan always on"
msgstr ""
msgid ""
"If enable this setting, part cooling fan will never be stoped and will run "
"at least at minimum speed to reduce the frequency of starting and stoping"
"If enable this setting, part cooling fan will never be stopped and will run "
"at least at minimum speed to reduce the frequency of starting and stopping"
msgstr ""
msgid "Don't slow down outer walls"
@@ -9898,8 +9898,8 @@ msgid ""
"\n"
" 1. To avoid changes in shine when printing glossy filaments \n"
"2. To avoid changes in external wall speed which may create slight wall "
"artefacts that appear like z banding \n"
"3. To avoid printing at speeds which cause VFAs (fine artefacts) on the "
"artifacts that appear like z banding \n"
"3. To avoid printing at speeds which cause VFAs (fine artifacts) on the "
"external walls\n"
"\n"
msgstr ""
@@ -9978,7 +9978,7 @@ msgid "Pellet flow coefficient"
msgstr ""
msgid ""
"Pellet flow coefficient is emperically derived and allows for volume "
"Pellet flow coefficient is empirically derived and allows for volume "
"calculation for pellet printers.\n"
"\n"
"Internally it is converted to filament_diameter. All other volume "
@@ -10099,23 +10099,23 @@ msgid ""
"parameters."
msgstr ""
msgid "Enable ramming for multitool setups"
msgid "Enable ramming for multi-tool setups"
msgstr ""
msgid ""
"Perform ramming when using multitool printer (i.e. when the 'Single Extruder "
"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. This option is only used when the wipe tower is enabled."
msgstr ""
msgid "Multitool ramming volume"
msgid "Multi-tool ramming volume"
msgstr ""
msgid "The volume to be rammed before the toolchange."
msgstr ""
msgid "Multitool ramming flow"
msgid "Multi-tool ramming flow"
msgstr ""
msgid "Flow used for ramming the filament before the toolchange."
@@ -10153,7 +10153,7 @@ msgstr ""
msgid ""
"The material softens at this temperature, so when the bed temperature is "
"equal to or greater than it, it's highly recommended to open the front door "
"and/or remove the upper glass to avoid cloggings."
"and/or remove the upper glass to avoid clogging."
msgstr ""
msgid "Price"
@@ -10421,7 +10421,7 @@ msgid ""
"This fan speed is enforced during all support interfaces, to be able to "
"weaken their bonding with a high fan speed.\n"
"Set to -1 to disable this override.\n"
"Can only be overriden by disable_fan_first_layers."
"Can only be overridden by disable_fan_first_layers."
msgstr ""
msgid ""
@@ -10442,7 +10442,7 @@ msgid "Fuzzy skin thickness"
msgstr ""
msgid ""
"The width within which to jitter. It's adversed to be below outer wall line "
"The width within which to jitter. It's advised to be below outer wall line "
"width"
msgstr ""
@@ -10450,7 +10450,7 @@ msgid "Fuzzy skin point distance"
msgstr ""
msgid ""
"The average diatance between the random points introducded on each line "
"The average distance between the random points introduced on each line "
"segment"
msgstr ""
@@ -10493,7 +10493,7 @@ msgid ""
"Enable this to get a G-code file which has G2 and G3 moves. The fitting "
"tolerance is same as the resolution. \n"
"\n"
"Note: For klipper machines, this option is recomended to be disabled. "
"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 "
@@ -10579,9 +10579,9 @@ msgid ""
"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).\n"
"It won't move fan comands from custom gcodes (they act as a sort of "
"It won't move fan commands from custom gcodes (they act as a sort of "
"'barrier').\n"
"It won't move fan comands into the start gcode if the 'only custom start "
"It won't move fan commands into the start gcode if the 'only custom start "
"gcode' is activated.\n"
"Use 0 to deactivate."
msgstr ""
@@ -10724,7 +10724,7 @@ msgstr ""
msgid ""
"Top solid infill area is enlarged slightly to overlap with wall for better "
"bonding and to minimize the appearance of pinholes where the top infill "
"meets the walls. A value of 25-30% is a good starting point, minimising the "
"meets the walls. A value of 25-30% is a good starting point, minimizing the "
"appearance of pinholes. The percentage value is relative to line width of "
"sparse infill"
msgstr ""
@@ -11303,7 +11303,7 @@ msgid ""
msgstr ""
msgid ""
"G-code path is genereated after simplifing the contour of model to avoid too "
"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"
msgstr ""
@@ -11452,7 +11452,7 @@ msgstr ""
msgid "Speed of retractions"
msgstr ""
msgid "Deretraction Speed"
msgid "De-retraction Speed"
msgstr ""
msgid ""
@@ -11627,15 +11627,15 @@ msgid "Wipe before external loop"
msgstr ""
msgid ""
"To minimise visibility of potential overextrusion at the start of an "
"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 deretraction is performed slightly on the inside from the "
"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"
"\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 deretraction move."
"printed immediately after a de-retraction move."
msgstr ""
msgid "Wipe speed"
@@ -11746,7 +11746,7 @@ msgid "Smooth Spiral"
msgstr ""
msgid ""
"Smooth Spiral smoothes out X and Y moves as wellresulting in no visible seam "
"Smooth Spiral smooths out X and Y moves as well, resulting in no visible seam "
"at all, even in the XY directions on walls that are not vertical"
msgstr ""
@@ -12300,7 +12300,7 @@ msgid ""
"The number of top solid layers is increased when slicing if the thickness "
"calculated by top shell layers is thinner than this value. This can avoid "
"having too thin shell when layer height is small. 0 means that this setting "
"is disabled and thickness of top shell is absolutely determained by top "
"is disabled and thickness of top shell is absolutely determined by top "
"shell layers"
msgstr ""
@@ -12319,7 +12319,7 @@ msgid "Wipe Distance"
msgstr ""
msgid ""
"Discribe how long the nozzle will move along the last path when "
"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 "
@@ -12494,7 +12494,7 @@ msgstr ""
msgid ""
"Maximum defection of a point to the estimated radius of the circle.\n"
"As cylinders are often exported as triangles of varying size, points may not "
"be on the circle circumference. This setting allows you some leway to "
"be on the circle circumference. This setting allows you some leeway to "
"broaden the detection.\n"
"In mm or in % of the radius."
msgstr ""
@@ -12526,7 +12526,7 @@ msgstr ""
msgid ""
"Relative extrusion is recommended when using \"label_objects\" option.Some "
"extruders work better with this option unckecked (absolute extrusion mode). "
"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"
msgstr ""
@@ -12602,9 +12602,9 @@ msgid ""
"could increase print time. Higher values remove more and longer walls.\n"
"\n"
"NOTE: Bottom and top surfaces will not be affected by this value to prevent "
"visual gaps on the ouside of the model. Adjust 'One wall threshold' in the "
"visual gaps on the outside of the model. Adjust 'One wall threshold' in the "
"Advanced settings below to adjust the sensitivity of what is considered a "
"top-surface. 'One wall threshold' is only visibile if this setting is set "
"top-surface. 'One wall threshold' is only visible if this setting is set "
"above the default value of 0.5, or if single-wall top surfaces is enabled."
msgstr ""
@@ -12633,7 +12633,7 @@ msgstr ""
msgid ""
"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 defaultly."
"Otherwise, rectilinear pattern is used by default."
msgstr ""
msgid "invalid value "
@@ -12712,13 +12712,13 @@ msgstr ""
msgid ""
"Retraction state at the beginning of the custom G-code block. If the custom "
"G-code moves the extruder axis, it should write to this variable so "
"PrusaSlicer deretracts correctly when it gets control back."
"PrusaSlicer de-retracts correctly when it gets control back."
msgstr ""
msgid "Extra deretraction"
msgid "Extra de-retraction"
msgstr ""
msgid "Currently planned extra extruder priming after deretraction."
msgid "Currently planned extra extruder priming after de-retraction."
msgstr ""
msgid "Absolute E position"
@@ -12768,7 +12768,7 @@ msgstr ""
msgid "Is extruder used?"
msgstr ""
msgid "Vector of bools stating whether a given extruder is used in the print."
msgid "Vector of booleans stating whether a given extruder is used in the print."
msgstr ""
msgid "Has single extruder MM priming"
@@ -13863,7 +13863,7 @@ msgstr ""
msgid "Filament type is not selected, please reselect type."
msgstr ""
msgid "Filament serial is not inputed, please input serial."
msgid "Filament serial is not entered, please enter serial."
msgstr ""
msgid ""
@@ -13923,7 +13923,7 @@ msgstr ""
msgid "Create Type"
msgstr ""
msgid "The model is not found, place reselect vendor."
msgid "The model is not found, please reselect vendor."
msgstr ""
msgid "Select Model"
@@ -13972,10 +13972,10 @@ msgstr ""
msgid "The printer model was not found, please reselect."
msgstr ""
msgid "The nozzle diameter is not found, place reselect."
msgid "The nozzle diameter is not found, please reselect."
msgstr ""
msgid "The printer preset is not found, place reselect."
msgid "The printer preset is not found, please reselect."
msgstr ""
msgid "Printer Preset"
@@ -14003,7 +14003,7 @@ msgid ""
"page. Please check before creating it."
msgstr ""
msgid "The custom printer or model is not inputed, place input."
msgid "The custom printer or model is not entered, please enter it."
msgstr ""
msgid ""
@@ -14035,7 +14035,7 @@ msgid "Current vendor has no models, please reselect."
msgstr ""
msgid ""
"You have not selected the vendor and model or inputed the custom vendor and "
"You have not selected the vendor and model or entered the custom vendor and "
"model."
msgstr ""
@@ -14136,7 +14136,7 @@ msgid ""
msgstr ""
msgid ""
"User's fillment preset set. \n"
"User's filament preset set. \n"
"Can be shared with others."
msgstr ""
@@ -14339,7 +14339,7 @@ msgstr ""
msgid "Could not connect to Duet"
msgstr ""
msgid "Unknown error occured"
msgid "Unknown error occurred"
msgstr ""
msgid "Wrong password"