From 40068156fe0d97e0c74184425cfce5c118424e25 Mon Sep 17 00:00:00 2001 From: manch1n Date: Wed, 12 Apr 2023 19:01:22 +0800 Subject: [PATCH] FIX: correct the translation of conflict check Change-Id: Idbc9114926a8ad7baad38bf8e2709f2a5442b5b4 (cherry picked from commit 9688a514d37fd3ff7152378463d10683acd58cb9) --- src/slic3r/GUI/GLCanvas3D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 0377bf5a93..13cd6fc9e8 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -8888,7 +8888,7 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state) case EWarning::GCodeConflict: { std::string objName1 = m_gcode_viewer.m_conflict_result.obj1Name; std::string objName2 = m_gcode_viewer.m_conflict_result.obj2Name; - text = (boost::format(L("Conflicts of gcode paths have been found. Please separate the conflicted objects farther (%s <-> %s).")) % objName1 % objName2).str(); + text = (boost::format(_u8L("Conflicts of gcode paths have been found. Please separate the conflicted objects farther (%s <-> %s).")) % objName1 % objName2).str(); error = ErrorType::SLICING_ERROR; break; }