From 315a988a8acf7e007755190049b8515d37ddc929 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 19 Oct 2023 12:17:21 +0200 Subject: [PATCH 1/2] Localization: fixes and changes in phrases --- resources/localization/list.txt | 1 + src/slic3r/GUI/Plater.cpp | 12 ++++++------ src/slic3r/GUI/WifiConfigDialog.cpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/localization/list.txt b/resources/localization/list.txt index 8895f4a932..18ef74bf8e 100644 --- a/resources/localization/list.txt +++ b/resources/localization/list.txt @@ -111,6 +111,7 @@ src/slic3r/GUI/Tab.cpp src/slic3r/GUI/Tab.hpp src/slic3r/GUI/UnsavedChangesDialog.cpp src/slic3r/GUI/UpdateDialogs.cpp +src/slic3r/GUI/WifiConfigDialog.cpp src/slic3r/GUI/WipeTowerDialog.cpp src/slic3r/GUI/wxExtensions.cpp src/slic3r/Utils/AppUpdater.cpp diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index acd9570408..102d53a39f 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5583,16 +5583,16 @@ void Plater::convert_gcode_to_ascii() using namespace bgcode::core; EResult res = is_valid_binary_gcode(*in_file.f); if (res == EResult::InvalidMagicNumber) { - MessageDialog msg_dlg(this, _L("The selected file is already in ascii format."), _L("Warning"), wxOK); + MessageDialog msg_dlg(this, _L("The selected file is already in ASCII format."), _L("Warning"), wxOK); msg_dlg.ShowModal(); return; } else { output_file = rename_file(output_file, ".gcode"); - wxString msg = _L("You are trying to convert to ascii a binary file whose extension is '.gcode'."); + wxString msg = _L("You are trying to convert to ASCII a binary file whose extension is '.gcode'."); msg += "\n" + _L("The exported file will be renamed as:"); msg += "\n\n" + output_file; - msg += "\n\n" + _L("Continue with export ?"); + msg += "\n\n" + _L("Continue with export?"); MessageDialog msg_dlg(this, msg, _L("Warning"), wxYES_NO); if (msg_dlg.ShowModal() != wxID_YES) return; @@ -5633,7 +5633,7 @@ void Plater::convert_gcode_to_ascii() } } - MessageDialog msg_dlg(this, Slic3r::GUI::format_wxstr("%1%\n%2%", _L("Successfully created G-code ascii file"), output_file), + MessageDialog msg_dlg(this, Slic3r::GUI::format_wxstr("%1%\n%2%", _L("Successfully created G-code ASCII file"), output_file), _L("Convert G-code file to ASCII format"), wxICON_ERROR | wxOK); msg_dlg.ShowModal(); } @@ -5669,10 +5669,10 @@ void Plater::convert_gcode_to_binary() } else { output_file = rename_file(output_file, ".bgcode"); - wxString msg = _L("You are trying to convert to binary an ascii file whose extension is '.bgcode'."); + wxString msg = _L("You are trying to convert to binary an ASCII file whose extension is '.bgcode'."); msg += "\n" + _L("The exported file will be renamed as:"); msg += "\n\n" + output_file; - msg += "\n\n" + _L("Continue with export ?"); + msg += "\n\n" + _L("Continue with export?"); MessageDialog msg_dlg(this, msg, _L("Warning"), wxYES_NO); if (msg_dlg.ShowModal() != wxID_YES) return; diff --git a/src/slic3r/GUI/WifiConfigDialog.cpp b/src/slic3r/GUI/WifiConfigDialog.cpp index 63af0ff5c5..85d6eb152d 100644 --- a/src/slic3r/GUI/WifiConfigDialog.cpp +++ b/src/slic3r/GUI/WifiConfigDialog.cpp @@ -42,7 +42,7 @@ WifiConfigDialog::WifiConfigDialog(wxWindow* parent, std::string& file_path, Rem wxStaticText* ssid_label = new wxStaticText(panel, wxID_ANY, GUI::format_wxstr("%1%:", _L("SSID"))); m_ssid_combo = new wxComboBox(panel, wxID_ANY); #if __APPLE__ - m_ssid_combo->SetToolTip(_L("On some versions of MacOS, this only loads SSID of connencted network.")); + m_ssid_combo->SetToolTip(_L("On some versions of MacOS, this only loads SSID of connected network.")); #endif // __APPLE__ rescan_networks(false); // TRN Text of button to rescan visible networks in Wifi Config dialog. From b1028267264ff9919c2664119342ee2a4b924a5f Mon Sep 17 00:00:00 2001 From: David Kocik Date: Thu, 19 Oct 2023 13:22:05 +0200 Subject: [PATCH 2/2] fix of string format --- src/slic3r/GUI/WifiConfigDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/WifiConfigDialog.cpp b/src/slic3r/GUI/WifiConfigDialog.cpp index 85d6eb152d..712f9154b2 100644 --- a/src/slic3r/GUI/WifiConfigDialog.cpp +++ b/src/slic3r/GUI/WifiConfigDialog.cpp @@ -230,7 +230,7 @@ void WifiConfigDialog::on_ok(wxCommandEvent& e) wxString ssid = m_ssid_combo->GetValue(); wxString pass = m_pass_textctrl->GetValue(); - wxString data = GUI::format( + std::string data = GUI::format( "[wifi]\n" "ssid=%1%\n" "psk=%2%\n"