Merge branch 'main' into dev/p2s-pr

# Conflicts:
#	src/slic3r/GUI/DeviceErrorDialog.cpp
This commit is contained in:
Noisyfox
2025-11-09 12:35:32 +08:00
48 changed files with 3533 additions and 3528 deletions

View File

@@ -965,7 +965,7 @@ void EditDevNameDialog::on_edit_name(wxCommandEvent &e)
if (m_valid_type == Valid && new_dev_name.length() > 32)
{
info_line = _L("The name is not allowed to exceeds 32 characters.");
info_line = _L("The name is not allowed to exceed 32 characters.");
m_valid_type = NoValid;
}