Merge branch 'master' into SoftFever

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
This commit is contained in:
SoftFever
2022-12-21 16:54:14 +08:00
54 changed files with 500 additions and 1230 deletions

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"POT-Creation-Date: 2022-12-17 12:28+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1328,6 +1328,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@@ -1770,8 +1773,8 @@ msgid ""
msgstr ""
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
msgid ""