GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 01:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-10-19 13:54:22 +02:00
commit 52e1ba0448
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/localization/list.txt
View File

@ -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

12
src/slic3r/GUI/Plater.cpp
View File

@ -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;

4
src/slic3r/GUI/WifiConfigDialog.cpp
View File

@ -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.
@ -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"