Merge main and fixed conflicts

localization/i18n/zh_CN/OrcaSlicer_zh_CN.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Slic3rPE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-08-31 11:46+0800\n"
+"POT-Creation-Date: 2026-09-03 10:27+0800\n"
 "PO-Revision-Date: 2026-06-11 12:37-0300\n"
 "Last-Translator: Handle <mail@bysb.net>\n"
 "Language-Team: \n"
@@ -2843,8 +2843,9 @@ msgstr "编辑"
 msgid "Merge with"
 msgstr "与其合并"
 
+# AI Translated
 msgid "Decompose Color"
-msgstr ""
+msgstr "分解颜色"
 
 msgid "Delete this filament"
 msgstr "移除此耗材"
@@ -3127,8 +3128,9 @@ msgstr "组合体"
 msgid "Merge parts to an object"
 msgstr "合并零件到对象"
 
+# AI Translated
 msgid "Using variable layer height together with mixed color sublayer may result in poor color mixing quality."
-msgstr ""
+msgstr "同时使用可变层高与混色子层可能导致混色质量不佳。"
 
 msgid "Add layers"
 msgstr "添加层"
@@ -6169,10 +6171,10 @@ msgstr "导入 3MF/STL/STEP/SVG/OBJ/AMF"
 msgid "Load a model"
 msgstr "加载模型"
 
-msgid "Import Zip Archive"
+msgid "Import ZIP Archive"
 msgstr "导入 ZIP 压缩文件"
 
-msgid "Load models contained within a zip archive"
+msgid "Load models contained within a ZIP archive"
 msgstr "从 ZIP 压缩文件中导入一个或多个模型"
 
 msgid "Import Configs"
@@ -7650,8 +7652,9 @@ msgstr "自定义当前盘"
 msgid "The %s nozzle can not print %s."
 msgstr "%s 喷嘴无法打印 %s。"
 
+# AI Translated
 msgid "Printing mixed-color filament on a single-extruder printer requires frequent filament changes and flushing, which may significantly increase waste and the risk of nozzle / waste-chute clogging."
-msgstr ""
+msgstr "在单挤出机打印机上打印混色耗材丝需要频繁换料和冲刷，可能显著增加废料以及喷嘴/废料槽堵塞的风险。"
 
 #, boost-format
 msgid "Mixing %1% with %2% in printing is not recommended.\n"
@@ -7778,20 +7781,25 @@ msgstr "从AMS同步材料列表"
 msgid "Set filaments to use"
 msgstr "配置可选择的材料"
 
+# AI Translated
 msgid "Add Mixed Filament"
-msgstr ""
+msgstr "添加混合耗材丝"
 
+# AI Translated
 msgid "Mixed Filament"
-msgstr ""
+msgstr "混合耗材丝"
 
+# AI Translated
 msgid "Remove last mixed filament"
-msgstr ""
+msgstr "移除最后一个混合耗材丝"
 
+# AI Translated
 msgid "Add mixed filament"
-msgstr ""
+msgstr "添加混合耗材丝"
 
+# AI Translated
 msgid "Mixed filament has invalid or mismatched components. Please re-edit affected entries."
-msgstr ""
+msgstr "混合耗材丝的组分无效或不匹配。请重新编辑受影响的条目。"
 
 msgid "Search plate, object and part."
 msgstr "搜索盘、模型和零件。"
@@ -7799,14 +7807,17 @@ msgstr "搜索盘、模型和零件。"
 msgid "Pellets"
 msgstr "颗粒"
 
+# AI Translated
 msgid "Mixed filament has broken component references"
-msgstr ""
+msgstr "混合耗材丝的组分引用已失效"
 
+# AI Translated
 msgid "Edit / Delete / Merge"
-msgstr ""
+msgstr "编辑 / 删除 / 合并"
 
+# AI Translated
 msgid "The target mixed filament uses this physical filament as a component. Merging will remove this physical filament and may invalidate the mixed filament. Continue?"
-msgstr ""
+msgstr "目标混合耗材丝将此物理耗材丝用作组分。合并将移除此物理耗材丝，并可能使该混合耗材丝失效。是否继续？"
 
 #, c-format, boost-format
 msgid "After completing your operation, %s project will be closed and create a new project."
@@ -7950,8 +7961,8 @@ msgstr ""
 msgid "Some filament slots were changed:"
 msgstr ""
 
-msgid "Component name(s) inside step file not in UTF8 format!"
-msgstr "STEP 文件中的部件名称不是 UTF8 格式！"
+msgid "Component name(s) inside step file not in UTF-8 format!"
+msgstr "STEP 文件中的部件名称不是 UTF-8 格式！"
 
 # AI Translated
 msgid "Because of unsupported text encoding, garbage characters may appear!"
@@ -7973,7 +7984,7 @@ msgstr "对象的体积为零"
 #, c-format, boost-format
 msgid ""
 "The object from file %s is too small, and may be in meters or inches.\n"
-" Do you want to scale to millimeters?"
+"Do you want to scale to millimeters?"
 msgstr ""
 "文件 %s 中对象的尺寸过小，似乎是以米（m）或者英寸（inch）为单位定义的。\n"
 "OrcaSlicer的内部单位为毫米（mm）。是否要转换成毫米（mm）？"
@@ -7994,11 +8005,13 @@ msgstr ""
 msgid "Multi-part object detected"
 msgstr "检测到多部分对象"
 
+# AI Translated
 msgid "Matching textures to filaments"
-msgstr ""
+msgstr "正在将纹理匹配到耗材丝"
 
+# AI Translated
 msgid "Texture Import Warning"
-msgstr ""
+msgstr "纹理导入警告"
 
 msgid "Load these files as a single object with multiple parts?\n"
 msgstr "将这些文件加载为一个多零件对象？\n"
@@ -8205,17 +8218,21 @@ msgstr ""
 msgid "Sync now"
 msgstr "立即同步"
 
+# AI Translated
 msgid "Texture import failed. The model appears to contain texture data, but the texture import process could not be completed. The model will be imported as geometry only."
-msgstr ""
+msgstr "纹理导入失败。模型中似乎包含纹理数据，但纹理导入过程未能完成。将仅导入模型的几何数据。"
 
+# AI Translated
 msgid "Applying texture colors..."
-msgstr ""
+msgstr "正在应用纹理颜色..."
 
+# AI Translated
 msgid "Updating 3D view..."
-msgstr ""
+msgstr "正在更新 3D 视图..."
 
+# AI Translated
 msgid "Texture colors applied."
-msgstr ""
+msgstr "纹理颜色已应用。"
 
 msgid "You can keep the modified presets for the new project or discard them"
 msgstr "您可以保留修改的预设到新项目中或者忽略这些修改"
@@ -9463,8 +9480,9 @@ msgstr "旋转花瓶"
 msgid "First layer filament sequence"
 msgstr "首层耗材打印顺序"
 
+# AI Translated
 msgid "The filament list contains mixed filaments. Custom filament sequence will not take effect."
-msgstr ""
+msgstr "耗材丝列表中包含混合耗材丝。自定义耗材丝顺序将不会生效。"
 
 msgid "By Layer"
 msgstr "逐层"
@@ -9540,7 +9558,13 @@ msgstr ""
 msgid "Publish 3MF..."
 msgstr ""
 
-msgid "Select which settings to embed in the 3MF file"
+msgid "Select which settings to be published in the 3MF file"
+msgstr ""
+
+msgid "Publish 3MF Wiki"
+msgstr ""
+
+msgid "Publish 3MF Video Guide"
 msgstr ""
 
 msgid "Mixed filament - published as a whole when \"Enable\" above is selected"
@@ -9558,12 +9582,6 @@ msgstr ""
 msgid "Embed the entire filament of this slot in the 3MF file"
 msgstr ""
 
-msgid "Material Ratio"
-msgstr ""
-
-msgid "Model Height"
-msgstr ""
-
 msgid "Filter non-selected"
 msgstr ""
 
@@ -10870,12 +10888,12 @@ msgid "No modifications need to be copied."
 msgstr "没有需要复制的修改。"
 
 # AI Translated
-msgid "Copy paramters"
+msgid "Copy parameters"
 msgstr "复制参数"
 
 # AI Translated
 #, c-format, boost-format
-msgid "Modify paramters of %s"
+msgid "Modify parameters of %s"
 msgstr "修改 %s 的参数"
 
 # AI Translated
@@ -12102,8 +12120,9 @@ msgstr "如果您仍要打印，可以在 偏好设置 / 控制 / 切片 / 移
 msgid "No extrusions under current settings."
 msgstr "根据当前设置，不会生成任何打印。"
 
+# AI Translated
 msgid "A gradient mixed filament is used, but 'Mixed color sublayer' is disabled. The gradient will not be printed."
-msgstr ""
+msgstr "使用了渐变混合耗材丝，但“混色子层”已关闭。渐变将不会被打印。"
 
 msgid "Smooth mode of timelapse is not supported when \"by object\" sequence is enabled."
 msgstr "平滑模式的延时摄影不支持在逐件打印模式下使用。"
@@ -12141,8 +12160,9 @@ msgstr "或许您想要缩小模型的尺寸，或者更改当前打印设置，
 msgid "Variable layer height is not supported with Organic supports."
 msgstr "Organic支撑不支持可变层高。"
 
+# AI Translated
 msgid "The wipe tower filament cannot be a mixed filament."
-msgstr ""
+msgstr "擦拭塔耗材丝不能是混合耗材丝。"
 
 msgid "Different nozzle diameters and different filament diameters may not work well when the prime tower is enabled. It's very experimental, so please proceed with caution."
 msgstr "当启用擦拭塔时，不同的喷嘴直径和不同的耗材丝直径可能无法很好地工作。这是非常实验性的，所以请谨慎操作。"
@@ -12491,7 +12511,7 @@ msgstr "mm 或 %"
 msgid "Other layers"
 msgstr "其它层"
 
-msgid "Bed temperature for layers except the initial one. A value of 0 means the filament does not support printing on the Cool Plate SuperTack."
+msgid "This is the bed temperature for layers except for the first one. A value of 0 means the filament does not support printing on the Cool Plate SuperTack."
 msgstr "除首层外的其他层的热床温度。0值表示该耗材丝不支持在Cool Plate SuperTack上打印。"
 
 msgid "This is the bed temperature for layers except for the first one. A value of 0 means the filament does not support printing on the Cool Plate."
@@ -13812,6 +13832,8 @@ msgstr "层时间"
 msgid "The part cooling fan will be enabled for layers where the estimated time is shorter than this value. Fan speed is interpolated between the minimum and maximum fan speeds according to layer printing time."
 msgstr "当层预估打印时间小于该数值时，部件冷却风扇将会被开启。风扇转速将根据层打印时间在最大和最小风扇转速之间插值获得"
 
+# AI Translated
+msgctxt "second"
 msgid "s"
 msgstr "s"
 
@@ -14130,47 +14152,61 @@ msgstr "支撑材料"
 msgid "Support material is commonly used to print supports and support interfaces."
 msgstr "支撑材料通常用于打印支撑体和支撑接触面"
 
+# AI Translated
 msgid "Is mixed filament"
-msgstr ""
+msgstr "是否为混合耗材丝"
 
+# AI Translated
 msgid "Whether this filament slot is a mixed filament composed of multiple physical filaments"
-msgstr ""
+msgstr "该耗材丝槽位是否为由多种物理耗材丝组成的混合耗材丝"
 
+# AI Translated
 msgid "Mixed filament components"
-msgstr ""
+msgstr "混合耗材丝组分"
 
+# AI Translated
 msgid "Comma-separated 1-based indices of component filaments, e.g. \"1,3\""
-msgstr ""
+msgstr "以逗号分隔的组分耗材丝序号（从 1 开始），例如 \"1,3\""
 
+# AI Translated
 msgid "Mixed filament sublayer ratios"
-msgstr ""
+msgstr "混合耗材丝子层比例"
 
+# AI Translated
 msgid "Comma-separated ratio values summing to 1.0, e.g. \"0.7,0.3\""
-msgstr ""
+msgstr "以逗号分隔、总和为 1.0 的比例值，例如 \"0.7,0.3\""
 
+# AI Translated
 msgid "Mixed filament gradient"
-msgstr ""
+msgstr "混合耗材丝渐变"
 
+# AI Translated
 msgid "Enable Z-direction gradient mode for mixed filament sub-layers. When enabled, the sub-layer ratios vary linearly across layers."
-msgstr ""
+msgstr "为混合耗材丝的子层启用 Z 方向渐变模式。启用后，子层比例会随层数线性变化。"
 
+# AI Translated
 msgid "Mixed filament gradient range"
-msgstr ""
+msgstr "混合耗材丝渐变范围"
 
+# AI Translated
 msgid "Start and end ratios for the first component in gradient mode. Comma-separated pair, e.g. \"0.10,0.90\" means 10% to 90%."
-msgstr ""
+msgstr "渐变模式下第一个组分的起始和结束比例。以逗号分隔的一对数值，例如 \"0.10,0.90\" 表示从 10% 到 90%。"
 
+# AI Translated
 msgid "Mixed filament gradient curve"
-msgstr ""
+msgstr "混合耗材丝渐变曲线"
 
+# AI Translated
 msgid "Optional Photoshop-style custom curve mapping Z progress to the first component ratio. Encoded as pipe-separated control points, either \"x,y\" (legacy) or \"x,y,m_in,m_out\" when a tangent override is needed (empty token or \"nan\" means use PCHIP default). x in [0,1]; y is clamped to the configured ratio range, e.g. \"0,0.15|0.5,0.50|1,0.85\". When empty, the linear gradient_range is used instead."
-msgstr ""
+msgstr "可选的 Photoshop 风格自定义曲线，将 Z 方向进度映射到第一个组分的比例。以竖线分隔的控制点进行编码，格式为 \"x,y\"（旧格式）或在需要覆盖切线时使用 \"x,y,m_in,m_out\"（留空或填 \"nan\" 表示使用 PCHIP 默认值）。x 取值范围为 [0,1]；y 会被限制在所配置的比例范围内，例如 \"0,0.15|0.5,0.50|1,0.85\"。留空时改用线性的 gradient_range。"
 
+# AI Translated
 msgid "Mixed filament per-part gradient"
-msgstr ""
+msgstr "混合耗材丝逐零件渐变"
 
+# AI Translated
 msgid "When gradient mode is enabled, apply the gradient to each part of an assembly independently rather than treating the whole assembly as one Z range."
-msgstr ""
+msgstr "启用渐变模式时，对组合体中的每个零件分别应用渐变，而不是将整个组合体视为一个 Z 范围。"
 
 msgid "Filament printable"
 msgstr "可打印耗材"
@@ -15423,6 +15459,7 @@ msgid "The allowed maximum output force of Y axis"
 msgstr "Y 轴允许的最大输出力"
 
 # AI Translated
+msgctxt "Newton"
 msgid "N"
 msgstr "N"
 
@@ -15435,6 +15472,7 @@ msgid "The machine bed mass load of Y axis"
 msgstr "Y 轴的机器热床质量负载"
 
 # AI Translated
+msgctxt "gram"
 msgid "g"
 msgstr "g"
 
@@ -15742,7 +15780,7 @@ msgstr "从切割区域到垃圾桶的起始和结束点。"
 msgid "Reduce infill retraction"
 msgstr "减小填充回抽"
 
-msgid "Don't retract when the travel is entirely within an infill area. That means the oozing can't been seen. This can reduce times of retraction for complex model and save printing time, but make slicing and G-code generating slower. Note that z-hop is also not performed in areas where retraction is skipped."
+msgid "Don't retract when the travel is entirely within an infill area. That means the oozing can't been seen. This can reduce times of retraction for complex model and save printing time, but make slicing and G-code generating slower. Note that Z-hop is also not performed in areas where retraction is skipped."
 msgstr "当空驶完全在填充区域内时不触发回抽。这意味着即使漏料也是不可见的。对于复杂模型，该设置能够减少回抽次数以及打印时长，但是会造成G-code生成变慢"
 
 msgid "This option will drop the temperature of the inactive extruders to prevent oozing."
@@ -15913,7 +15951,7 @@ msgstr "擦拭后的回抽量"
 # AI Translated
 #, no-c-format, no-boost-format
 msgid ""
-"The length of fast retraction after wipe, relative to retraction length.\n"
+"This is the length of fast retraction after wipe, relative to retraction length.\n"
 "The value will be clamped by 100% minus the retract amount before the wipe value."
 msgstr ""
 "擦拭后快速回抽的长度，相对于回抽长度。\n"
@@ -15960,7 +15998,7 @@ msgstr "在换工具头之前触发回抽时，耗材丝会按指定的长度回
 msgid "Z-hop height"
 msgstr "Z抬升高度"
 
-msgid "Whenever there is a retraction, the nozzle is lifted a little to create clearance between the nozzle and the print. This prevents the nozzle from hitting the print when traveling more. Using spiral lines to lift z can prevent stringing."
+msgid "Whenever there is a retraction, the nozzle is lifted a little to create clearance between the nozzle and the print. This prevents the nozzle from hitting the print when traveling more. Using spiral lines to lift Z can prevent stringing."
 msgstr "回抽完成之后，喷嘴轻微抬升，和打印件之间产生一定间隙。这能够避免空驶时喷嘴和打印件剐蹭和碰撞。使用螺旋线抬升z能够减少拉丝。"
 
 msgid "Z-hop lower boundary"
@@ -17006,11 +17044,13 @@ msgstr ""
 "\n"
 "在下方的擦拭前回抽量设置中输入一个数值，将在擦拭动作之前执行任何超出部分的回抽，否则超出部分的回抽将在擦拭之后执行。"
 
+# AI Translated
 msgid "Mixed color sublayer"
-msgstr ""
+msgstr "混色子层"
 
+# AI Translated
 msgid "Enable mixed color sublayer splitting. When enabled, layers containing mixed color filaments will be split into sub-layers to achieve color mixing effects."
-msgstr ""
+msgstr "启用混色子层拆分。启用后，含有混色耗材丝的层将被拆分为子层，以实现混色效果。"
 
 msgid "The wiping tower can be used to clean up residue on the nozzle and stabilize the chamber pressure inside the nozzle in order to avoid appearance defects when printing objects."
 msgstr "擦拭塔可以用来清理喷嘴上的残留料和让喷嘴内部的腔压达到稳定状态，以避免打印物体时出现外观瑕疵。"
@@ -18087,8 +18127,9 @@ msgstr "模型文件的网格划分失败，或缺少有效的形状。"
 msgid "The supplied file couldn't be read because it's empty."
 msgstr "无法读取提供的文件，因为该文件内容为空。"
 
+# AI Translated
 msgid "The file format is incompatible and cannot be parsed."
-msgstr ""
+msgstr "文件格式不兼容，无法解析。"
 
 msgid "Unknown file format: input file must have .stl, .obj, or .amf(.xml) extension."
 msgstr "未知的文件格式。输入文件的扩展名必须为 .stl、.obj 或 .amf（.xml）。"
@@ -19554,17 +19595,17 @@ msgstr "仅显示对打印机、耗材和工艺预设有改动的打印机名称
 msgid "Only display the filament names with changes to filament presets."
 msgstr "仅显示对耗材预设有改动的耗材名称。"
 
-msgid "Only printer names with user printer presets will be displayed, and each preset you choose will be exported as a zip."
+msgid "Only printer names with user printer presets will be displayed, and each preset you choose will be exported as a ZIP archive."
 msgstr "只显示带有用户打印机预设的打印机名称，并且您选择的每个预设都将导出为一个 ZIP 文件。"
 
 msgid ""
 "Only the filament names with user filament presets will be displayed, \n"
-"and all user filament presets in each filament name you select will be exported as a zip."
+"and all user filament presets in each filament name you select will be exported as a ZIP archive."
 msgstr "只显示带有用户耗材预设的耗材名称，您选择的每个耗材名称中的所有用户耗材预设都将导出为一个 ZIP 文件。"
 
 msgid ""
 "Only printer names with changed process presets will be displayed, \n"
-"and all user process presets in each printer name you select will be exported as a zip."
+"and all user process presets in each printer name you select will be exported as a ZIP archive."
 msgstr "只显示带有更改的工艺预设的打印机名称，您选择的每个打印机名称中的所有用户工艺预设都将导出为一个 ZIP 文件。"
 
 msgid "Please select at least one printer or filament."
@@ -19803,7 +19844,7 @@ msgid "We need information for diagnosing source of the issue. Check wiki page f
 msgstr "我们需要相关信息来诊断问题的根源。请查看 wiki 页面获取详细指南。"
 
 # AI Translated
-msgid "Pack button collects project file and logs of current session onto a zip file."
+msgid "Pack button collects project file and logs of current session onto a ZIP archive."
 msgstr "“打包”按钮会将当前会话的项目文件和日志收集到一个 zip 文件中。"
 
 # AI Translated
@@ -19859,7 +19900,7 @@ msgid "Stored logs"
 msgstr "已存储的日志"
 
 # AI Translated
-msgid "Packs all stored logs onto a zip file."
+msgid "Packs all stored logs onto a ZIP archive."
 msgstr "将所有已存储的日志打包到一个 zip 文件中。"
 
 # AI Translated
@@ -19939,7 +19980,7 @@ msgstr "未找到打印机类型，请手动选择。"
 msgid "Authorizing..."
 msgstr "正在授权..."
 
-msgid "Error. Can't get api token for authorization"
+msgid "Error. Can't get API token for authorization"
 msgstr "错误。无法获取用于授权的 API 令牌"
 
 msgid "Could not parse server response."
@@ -20389,8 +20430,8 @@ msgid "Enable smart filament assign: Assign one filament to multiple nozzles to
 msgstr "启用智能耗材分配：将一种耗材分配给多个喷嘴以最大化节省"
 
 # AI Translated
-msgid "Fila Saving"
-msgstr "耗材节省"
+msgid "File Saving"
+msgstr "文件保存"
 
 msgid "Don't remind me again"
 msgstr "不再提醒"
@@ -20676,6 +20717,15 @@ msgstr "此操作无法撤消。继续？"
 msgid "Skipping objects."
 msgstr "跳过对象。"
 
+msgid "Material Ratio"
+msgstr ""
+
+msgid "Model Height"
+msgstr ""
+
+msgid "Ratio"
+msgstr ""
+
 msgid "Select Filament"
 msgstr "选择耗材"
 
@@ -20755,6 +20805,9 @@ msgstr "立即重启"
 msgid "NO RAMMING AT ALL"
 msgstr "完全不挤压"
 
+msgid "s"
+msgstr "s"
+
 msgid "Volumetric speed"
 msgstr "体积流量"
 
@@ -21400,6 +21453,18 @@ msgstr ""
 #~ msgid "Your system is missing H.264 codecs for GStreamer, which are required to play video. (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Orca Slicer?)"
 #~ msgstr "您的系统缺少 GStreamer 所需的 H.264 编解码器，这是播放视频所必需的。（尝试安装 gstreamer1.0-plugins-bad 或 gstreamer1.0-libav 软件包，然后重新启动 Orca Slicer？）"
 
+# AI Translated
+#~ msgid "N"
+#~ msgstr "N"
+
+# AI Translated
+#~ msgid "g"
+#~ msgstr "g"
+
+# AI Translated
+#~ msgid "Fila Saving"
+#~ msgstr "耗材节省"
+
 #~ msgid ""
 #~ "Layer height is too small.\n"
 #~ "It will set to min_layer_height\n"