ENH: add cn translation for conflict check

Change-Id: Id2c034567dbbf8878a601af1af16f1c8d24d1033

bbl/i18n/zh_cn/BambuStudio_zh_CN.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Slic3rPE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-14 17:28+0800\n"
-"PO-Revision-Date: 2023-04-10 17:13+0800\n"
+"POT-Creation-Date: 2023-04-16 12:36+0800\n"
+"PO-Revision-Date: 2023-04-16 12:40+0800\n"
 "Last-Translator: Jiang Yue <maze1024@gmail.com>\n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -1992,7 +1992,7 @@ msgid "Do not Enable AMS"
 msgstr "不启用AMS"
 
 msgid "Print using materials mounted on the back of the case"
-msgstr ""
+msgstr "使用安装在机箱背面的材料进行打印"
 
 msgid "Print with filaments in ams"
 msgstr "采用AMS里的材料打印"
@@ -2856,9 +2856,11 @@ msgstr "尺寸："
 
 #, c-format, boost-format
 msgid ""
-"Conflicts of gcode paths have been found. Please separate the conflicted "
-"objects farther (%s <-> %s)."
-msgstr "发现gcode路径的冲突。请将有冲突的对象分离得更远(%s <-> %s)。"
+"Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
+"separate the conflicted objects farther (%s <-> %s)."
+msgstr ""
+"发现gcode路径在层%d，高为%.2lf mm处的冲突。请将有冲突的对象分离得更远(%s <-> "
+"%s)。"
 
 msgid "An object is layed over the boundary of plate."
 msgstr "检测到有对象放在盘的边界上。"
@@ -2877,6 +2879,12 @@ msgstr ""
 "对象被放置在打印板的边界上或超过高度限制。\n"
 "请通过将其完全移动到打印板内或打印板外，并确认高度在构建空间以内来解决问题。"
 
+msgid "Jump to"
+msgstr "跳转到"
+
+msgid "ERROR:"
+msgstr "错误："
+
 msgid "Calibration"
 msgstr "校准"
 
@@ -3793,9 +3801,6 @@ msgstr "取消上传"
 msgid "Slice ok."
 msgstr "切片完成."
 
-msgid "Jump to"
-msgstr "跳转到"
-
 msgid "Error:"
 msgstr "错误："
 
@@ -5039,8 +5044,8 @@ msgstr ""
 msgid ""
 "When recording timelapse without toolhead, it is recommended to add a "
 "\"Timelapse Wipe Tower\" \n"
-"by right-click the empty position of build plate and choose \"Add Primitive"
-"\"->\"Timelapse Wipe Tower\"."
+"by right-click the empty position of build plate and choose \"Add "
+"Primitive\"->\"Timelapse Wipe Tower\"."
 msgstr ""
 "在录制无工具头延时摄影视频时，建议添加“延时摄影擦料塔”\n"
 "右键单击打印板的空白位置，选择“添加标准模型”->“延时摄影擦料塔”。"
@@ -6512,6 +6517,7 @@ msgid ""
 "This controls the generation of the brim at outer and/or inner side of "
 "models. Auto means the brim width is analysed and calculated automatically."
 msgstr ""
+"该参数控制在模型的外侧和/或内侧生成brim。自动是指自动分析和计算边框的宽度。"
 
 msgid "Outer brim only"
 msgstr "仅外侧"
@@ -8208,7 +8214,7 @@ msgid "No check"
 msgstr ""
 
 msgid "Do not run any validity checks, such as gcode path conflicts check."
-msgstr ""
+msgstr "不要运行任何有效性检查，如gcode路径冲突检查。"
 
 msgid "Normative check"
 msgstr ""
@@ -8624,6 +8630,12 @@ msgstr ""
 "提高强度\n"
 "你知道吗？你可以使用更多的墙层数和更高的疏散填充密度来提高模型的强度。"
 
+#, c-format, boost-format
+#~ msgid ""
+#~ "Conflicts of gcode paths have been found. Please separate the conflicted "
+#~ "objects farther (%s <-> %s)."
+#~ msgstr "发现gcode路径的冲突。请将有冲突的对象分离得更远(%s <-> %s)。"
+
 #~ msgid ""
 #~ "Please check the following infomation and click Confirm to continue "
 #~ "sending print:"
@@ -11024,9 +11036,6 @@ msgstr ""
 #~ msgid "Slicing finished."
 #~ msgstr "切片完成。"
 
-#~ msgid "ERROR:"
-#~ msgstr "错误："
-
 #~ msgid "Exporting finished."
 #~ msgstr "导出完成。"
 
@@ -12392,8 +12401,8 @@ msgstr ""
 #~ msgstr "正在准备设置页"
 
 #~ msgid ""
-#~ "You have the following presets with saved options for \"Print Host upload"
-#~ "\""
+#~ "You have the following presets with saved options for \"Print Host "
+#~ "upload\""
 #~ msgstr "您的以下预设中包含未保存的选项“打印主机上传”"
 
 #~ msgid ""