ENH: update some sentences and refine ui

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibba2d6c880fcb810f861cf06eb7a30a512cbbacf

src/slic3r/GUI/GLCanvas3D.cpp

@@ -1485,7 +1485,7 @@ static std::pair<bool, bool> construct_extruder_unprintable_error(ObjectFilament
             model_prefix = (boost::format(_u8L("The model %s is")) % object_result.object_filaments.front().object->name).str();
         tips[idx] += model_prefix;
         tips[idx] += (boost::format(_u8L(" located within the %s only area, making it impossible to print with the filaments assigned to %s.\n"
-            "Please move the model out of the %s only area or adjust the filament assignment\n")) % opposite_nozzle_name % nozzle_name % opposite_nozzle_name).str();
+            "Please move the model out of the %s only area or adjust the filament assignment.")) % opposite_nozzle_name % nozzle_name % opposite_nozzle_name).str();
 
         if (object_result.object_filaments.size() > 1) {
             for (ObjectFilamentInfo& object_filament : left_unprintable_objects)

src/slic3r/GUI/GUI_Factories.cpp

@@ -1379,7 +1379,7 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men
             []() { return plater()->sidebar().combos_filament().size() > 1; }, m_parent);
     }
 
-    const int item_id = menu->FindItem(_L("Delete then replace with"));
+    const int item_id = menu->FindItem(_L("Merge with"));
     if (item_id != wxNOT_FOUND)
         menu->Destroy(item_id);
 
@@ -1397,7 +1397,7 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men
             [i](wxCommandEvent&) { plater()->sidebar().change_filament(-2, i); }, *icons[i], menu,
             []() { return true; }, m_parent);
     }
-    append_submenu(menu, sub_menu, wxID_ANY, _L("Delete then replace with"), "", "",
+    append_submenu(menu, sub_menu, wxID_ANY, _L("Merge with"), "", "",
         [filaments_cnt]() { return filaments_cnt > 1; }, m_parent);
 }
 

src/slic3r/GUI/Plater.cpp

@@ -9335,13 +9335,13 @@ bool Plater::priv::check_ams_status_impl(bool is_slice_all)
             {
                 SyncInfoDialog(wxWindow *parent)
                     : MessageDialog(parent,
-                                    _L("It is detected that you have not synchronized the nozzle and AMS information.\n"
+                                    _L("The nozzle type and AMS quantity information has not been synced from the connected printer.\n"
-                                       "If you synchronize it before slicing, the filament arrangement will be more reasonable.\n"
+                                       "After syncing, software can optimize printing time and filament usage when slicing.\n"
-                                       "Do you need to synchronize it ?"),
+                                       "Would you like to sync now ?"),
                                     _L("Warning"), 0)
                 {
                     add_button(wxID_YES, true, _L("Sync now"));
-                    add_button(wxID_NO, true, _L("Out of sync"));
+                    add_button(wxID_NO, true, _L("Later"));
                 }
             } dlg(q);
             dlg.Fit();
@@ -13155,7 +13155,7 @@ bool check_printer_initialized(MachineObject *obj)
     }
 
     if (!has_been_initialized) {
-        MessageDialog dlg(wxGetApp().plater(), _L("It is detected that the nozzle type is not set. please set the nozzle first and then perform the current operation again."), _L("Warning"), wxOK | wxICON_WARNING);
+        MessageDialog dlg(wxGetApp().plater(), _L("The nozzle type is not set. Please set the nozzle and try again."), _L("Warning"), wxOK | wxICON_WARNING);
         dlg.ShowModal();
 
         PrinterPartsDialog* print_parts_dlg = new PrinterPartsDialog(nullptr);

src/slic3r/GUI/Preferences.cpp

@@ -1158,7 +1158,7 @@ wxWindow* PreferencesDialog::create_general_page()
 #endif
         50, "single_instance");
 
-    auto item_auto_transfer_when_switch_preset = create_item_checkbox(_L("Automatically transfer modified value when switching process and filament presets"), page,_L("Default behavior for handling modified values when switching process and filament presets. After closing, a popup will appear to ask each time"), 50, "auto_transfer_when_switch_preset");
+    auto item_auto_transfer_when_switch_preset = create_item_checkbox(_L("Automatically transfer modified value when switching process and filament presets"), page,_L("After closing, a popup will appear to ask each time"), 50, "auto_transfer_when_switch_preset");
     auto item_bed_type_follow_preset = create_item_checkbox(_L("Auto plate type"), page,    
                                                          _L("Studio will remember build plate selected last time for certain printer model."), 50,
                                                          "user_bed_type");

src/slic3r/GUI/SelectMachine.cpp

@@ -534,7 +534,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
     m_txt_mapping_sugs->SetMinSize(wxSize(FromDIP(580), -1));
     m_txt_mapping_sugs->SetMaxSize(wxSize(FromDIP(580), -1));
     m_txt_mapping_sugs->SetBackgroundColour(*wxWHITE);
-    m_txt_mapping_sugs->SetLabel(_L("Your material arrangement method is not optimal."));
+    m_txt_mapping_sugs->SetLabel(_L("Your filament arrangement method is not optimal."));
     m_mapping_sugs_sizer->Add(m_img_mapping_sugs, 0, wxALIGN_CENTER, 0);
     m_mapping_sugs_sizer->Add(m_txt_mapping_sugs, 0, wxALIGN_CENTER, 0);
 

src/slic3r/GUI/WipeTowerDialog.cpp

@@ -268,6 +268,7 @@ WipingDialog::WipingDialog(wxWindow* parent, const std::vector<float>& matrix, c
             e.Skip();
         });
 
+    CenterOnParent();
     wxGetApp().UpdateDlgDarkUI(this);
 }