Merge branch 'main' into feature/texture-color-number

This commit is contained in:
SoftFever
2026-10-09 22:58:10 +08:00
11 changed files with 223 additions and 26 deletions
+2 -1
View File
@@ -15032,7 +15032,8 @@ bool Plater::priv::undo_redo_blocked_by_job()
return false;
notification_manager->push_notification(NotificationType::CustomNotification,
NotificationManager::NotificationLevel::RegularNotificationLevel,
_u8L("Cannot undo or redo while an operation is running. Stop it first."));
_u8L("Cannot undo or redo while an operation is running. Stop the operation, or wait "
"for it to finish and then retry."));
return true;
}