From 04d69d305b64661c666bd8c41ec046ea2582140a Mon Sep 17 00:00:00 2001 From: KrisMorr <154343071+KrisMorr@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:41:20 +0100 Subject: [PATCH] revert PrintConfig + .pot update --- localization/i18n/OrcaSlicer.pot | 15 ++++++--------- src/libslic3r/PrintConfig.cpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index f126acd1924..c17671266b0 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -2144,7 +2144,7 @@ msgstr "" msgid "Outside" msgstr "" -msgid " " +msgid "" msgstr "" msgid "Layer height" @@ -8313,13 +8313,12 @@ msgstr "" msgid "One wall threshold" msgstr "" -#, possible-c-format, possible-boost-format msgid "" "If a top surface has to be printed and it's partially covered by another " "layer, it won't be considered at a top layer where its width is below this " "value. This can be useful to not let the 'one perimeter on top' trigger on " "surface that should be covered only by perimeters. This value can be a mm or " -"a %% of the perimeter extrusion width.\n" +"a % of the perimeter extrusion width.\n" "Warning: If enabled, artifacts can be created if you have some thin features " "on the next layer, like letters. Set this setting to 0 to remove these " "artifacts." @@ -8399,7 +8398,7 @@ msgstr "" msgid "" "Number of mm the overhang need to be for the reversal to be considered " -"useful. Can be a (%) of the perimeter width.\n" +"useful. Can be a % of the perimeter width.\n" "Value 0 enables reversal on every odd layers regardless." msgstr "" @@ -9002,10 +9001,9 @@ msgstr "" msgid "Shrinkage" msgstr "" -#, possible-c-format, possible-boost-format msgid "" "Enter the shrinkage percentage that the filament will get after cooling " -"(94%% if you measure 94mm instead of 100mm). The part will be scaled in xy " +"(94% if you measure 94mm instead of 100mm). The part will be scaled in xy " "to compensate. Only the filament used for the perimeter is taken into " "account.\n" "Be sure to allow enough space between objects, as this compensation is done " @@ -9185,9 +9183,8 @@ msgstr "" msgid "Sparse infill density" msgstr "" -#, possible-c-format, possible-boost-format msgid "" -"Density of internal sparse infill, 100%% turns all sparse infill into solid " +"Density of internal sparse infill, 100% turns all sparse infill into solid " "infill and internal solid infill pattern will be used" msgstr "" @@ -11110,7 +11107,7 @@ msgid "" "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 " "broaden the detection.\n" -"In (mm or in %) of the radius." +"In mm or in % of the radius." msgstr "" msgid "Polyhole twist" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 209741ab1d2..f07b0de3ae0 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -922,7 +922,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Quality"); def->tooltip = L("If a top surface has to be printed and it's partially covered by another layer, it won't be considered at a top layer where its width is below this value." " This can be useful to not let the 'one perimeter on top' trigger on surface that should be covered only by perimeters." - " This value can be a mm or a %% of the perimeter extrusion width." + " This value can be a mm or a % of the perimeter extrusion width." "\nWarning: If enabled, artifacts can be created if you have some thin features on the next layer, like letters. Set this setting to 0 to remove these artifacts."); def->sidetext = L("mm or %"); def->ratio_over = "inner_wall_line_width"; @@ -982,7 +982,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Reverse threshold"); def->full_label = L("Overhang reversal threshold"); def->category = L("Quality"); - def->tooltip = L("Number of mm the overhang need to be for the reversal to be considered useful. Can be a %% of the perimeter width." + def->tooltip = L("Number of mm the overhang need to be for the reversal to be considered useful. Can be a % of the perimeter width." "\nValue 0 enables reversal on every odd layers regardless."); def->sidetext = L("mm or %"); def->ratio_over = "line_width"; @@ -1734,7 +1734,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_shrink", coPercents); def->label = L("Shrinkage"); - def->tooltip = L("Enter the shrinkage percentage that the filament will get after cooling (94%% if you measure 94mm instead of 100mm)." + def->tooltip = L("Enter the shrinkage percentage that the filament will get after cooling (94% if you measure 94mm instead of 100mm)." " The part will be scaled in xy to compensate." " Only the filament used for the perimeter is taken into account." "\nBe sure to allow enough space between objects, as this compensation is done after the checks."); @@ -1961,7 +1961,7 @@ def = this->add("filament_loading_speed", coFloats); def = this->add("sparse_infill_density", coPercent); def->label = L("Sparse infill density"); def->category = L("Strength"); - def->tooltip = L("Density of internal sparse infill, 100%% turns all sparse infill into solid infill and internal solid infill pattern will be used"); + def->tooltip = L("Density of internal sparse infill, 100% turns all sparse infill into solid infill and internal solid infill pattern will be used"); def->sidetext = L("%"); def->min = 0; def->max = 100; @@ -3039,7 +3039,7 @@ def = this->add("filament_loading_speed", coFloats); def->enum_values.push_back("astrobox"); def->enum_values.push_back("repetier"); def->enum_values.push_back("mks"); -def->enum_values.push_back("obico"); + def->enum_values.push_back("obico"); def->enum_labels.push_back("PrusaLink"); def->enum_labels.push_back("PrusaConnect"); def->enum_labels.push_back("Octo/Klipper"); @@ -3048,7 +3048,7 @@ def->enum_values.push_back("obico"); def->enum_labels.push_back("AstroBox"); def->enum_labels.push_back("Repetier"); def->enum_labels.push_back("MKS"); -def->enum_labels.push_back("Obico"); + def->enum_labels.push_back("Obico"); def->mode = comAdvanced; def->cli = ConfigOptionDef::nocli; def->set_default_value(new ConfigOptionEnum(htOctoPrint)); @@ -4624,7 +4624,7 @@ def->enum_labels.push_back("Obico"); def->tooltip = L("Maximum defection of a point to the estimated radius of the circle." "\nAs cylinders are often exported as triangles of varying size, points may not be on the circle circumference." " This setting allows you some leway to broaden the detection." - "\nIn (mm or in %) of the radius."); + "\nIn mm or in % of the radius."); def->sidetext = L("mm or %"); def->max_literal = 10; def->mode = comAdvanced; @@ -4752,7 +4752,7 @@ def->enum_labels.push_back("Obico"); "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 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 above the default value of 0.5, or if single-wall top surfaces is enabled."); - def->sidetext = L(" "); + def->sidetext = L(""); def->mode = comAdvanced; def->min = 0.0; def->max = 25.0;