fix typo for calibration bridge flow (don't use flow < 20)

and some other string typos

resources/calibration/retraction/retraction.html

@@ -35,7 +35,7 @@ This calibration will help you to choose the right retraction length for your ex
 <h3>Remove filament slowdown</h3>
 This button will change your settings in filament/cooling to disable all features that trigger when a layer is too small to be able to cool down in time. With these algorithms disabled, your print will be more challenging in terms of retraction, so it's a good stress test. To re-enable them, remove all modifications from the filament tab (the little orange 'back arrow").
 <h3>Results</h3>
-<p>When the test pieces are printed, you can count the millimetre with the ridges on the sides of the print towers. I count them with my nail. When you're at the height where there are no more strings, you can write down the millimetre number. Multiply it by your step parameter (0.2, 0.2, 0.5 or 1) and you have your retraction length number. You can add 20% more length to have a little margin.</p>
+<p>When the test pieces are printed, you can count the millimetre with the ridges on the sides of the print towers. I count them with my nail. When you're at the height where there are no more strings, you can write down the millimetre number. Multiply it by your step parameter (0.1, 0.2, 0.5 or 1) and you have your retraction length number. You can add 20% more length to have a little margin.</p>
 <p>If you have multiple prints with different temperatures, you need to choose the best print, the one with the least amount of stringing, unless the decrease in stringing isn't big enough to warrant the decrease in temperature.
 <h2>Example</h2>
 <table width="100%">

src/libslic3r/Fill/FillBase.cpp

@@ -616,7 +616,7 @@ Fill::do_gap_fill(const ExPolygons &gapfill_areas, const FillParams &params, Ext
 #endif
 
         ExtrusionEntityCollection gap_fill = thin_variable_width(polylines_gapfill, erGapFill, *params.flow);
-        //set role if needed (it will confuse the auto-speed, so don't change it from gap fill)
+        //set role if needed
         /*if (params.role != erSolidInfill) {
             ExtrusionSetRole set_good_role(params.role);
             gap_fill.visit(set_good_role);

src/slic3r/GUI/CalibrationBridgeDialog.cpp

@@ -84,7 +84,7 @@ void CalibrationBridgeDialog::create_geometry(std::string setting_to_test, bool
     int start = bridge_flow_ratio->value;
     float zshift = 2.3 * (1 - z_scale);
     for (size_t i = 0; i < nb_items; i++) {
-        if((start + (add ? 1 : -1) * i * step) < 180 && start + (start + (add ? 1 : -1) * i * step) > 20)
+        if((start + (add ? 1 : -1) * i * step) < 180 && (start + (add ? 1 : -1) * i * step) > 20)
             add_part(model.objects[objs_idx[i]], Slic3r::resources_dir() + "/calibration/bridge_flow/f"+std::to_string(start + (add ? 1 : -1) * i * step)+".amf", Vec3d{ -10,0, zshift + 4.6 * z_scale }, Vec3d{ 1,1,z_scale });
     }
 

src/slic3r/GUI/CalibrationRetractionDialog.cpp

@@ -24,11 +24,11 @@ namespace GUI {
 void CalibrationRetractionDialog::create_buttons(wxStdDialogButtonSizer* buttons){
     wxString choices_steps[] = { "0.1","0.2","0.5","1" };
     steps = new wxComboBox(this, wxID_ANY, wxString{ "0.2" }, wxDefaultPosition, wxDefaultSize, 4, choices_steps);
-    steps->SetToolTip(_(L("Each militer add this value to the retraction value. ")));
+    steps->SetToolTip(_L("Each militer add this value to the retraction value. "));
     steps->SetSelection(1);
     wxString choices_nb[] = { "2","4","6","8","10","15","20","25" };
     nb_steps = new wxComboBox(this, wxID_ANY, wxString{ "15" }, wxDefaultPosition, wxDefaultSize, 8, choices_nb);
-    nb_steps->SetToolTip(_(L("Select the number milimeters for the tower.")));
+    nb_steps->SetToolTip(_L("Select the number milimeters for the tower."));
     nb_steps->SetSelection(5);
     //wxString choices_start[] = { "current","260","250","240","230","220","210" };
     //start_step = new wxComboBox(this, wxID_ANY, wxString{ "current" }, wxDefaultPosition, wxDefaultSize, 7, choices_start);
@@ -38,9 +38,10 @@ void CalibrationRetractionDialog::create_buttons(wxStdDialogButtonSizer* buttons
     int temp = int((2 + filament_config->option<ConfigOptionInts>("temperature")->get_at(0)) / 5) * 5;
     auto size = wxSize(4 * em_unit(), wxDefaultCoord);
     temp_start = new wxTextCtrl(this, wxID_ANY, std::to_string(temp), wxDefaultPosition, size);
-    wxString choices_decr[] = { "one test","2x10°","3x10°","4x10°","3x5°","5x5°" };
+    wxString degree = L'°' ;
+    wxString choices_decr[] = { "one test","2x10"+ degree,"3x10"+ degree, L"4x10°", _("3x50°"), _L("5x5°") };
     decr_temp = new wxComboBox(this, wxID_ANY, wxString{ "current" }, wxDefaultPosition, wxDefaultSize, 6, choices_decr);
-    decr_temp->SetToolTip(_(L("Select the number tower to print, and by how many degrees C to decrease each time.")));
+    decr_temp->SetToolTip(_L("Select the number tower to print, and by how many degrees C to decrease each time."));
     decr_temp->SetSelection(0);
 
     buttons->Add(new wxStaticText(this, wxID_ANY, wxString{ "step:" }));