Merge remote-tracking branch 'upstream/main' into add_more_de

SoftFever · Mar 6, 2025 · 5efded7 · 5efded7
2 parents c6c7a32 + fc2335e
commit 5efded7
Show file tree

Hide file tree

Showing 23 changed files with 7,303 additions and 6,562 deletions.
diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot
@@ -4700,16 +4700,19 @@ msgid "&Help"
 msgstr ""
 
 #, possible-c-format, possible-boost-format
-msgid "A file exists with the same name: %s, do you want to override it."
+msgid "A file exists with the same name: %s, do you want to overwrite it?"
 msgstr ""
 
 #, possible-c-format, possible-boost-format
-msgid "A config exists with the same name: %s, do you want to override it."
+msgid "A config exists with the same name: %s, do you want to overwrite it?"
 msgstr ""
 
 msgid "Overwrite file"
 msgstr ""
 
+msgid "Overwrite config"
+msgstr ""
+
 msgid "Yes to All"
 msgstr ""
 
@@ -6166,9 +6169,9 @@ msgstr ""
 
 #, possible-c-format, possible-boost-format
 msgid ""
-"Plate% d: %s is not suggested to be used to print filament %s(%s). If you "
+"Plate %d: %s is not suggested to be used to print filament %s(%s). If you "
 "still want to do this printing, please set this filament's bed temperature "
-"to non zero."
+"to non-zero."
 msgstr ""
 
 msgid "Switching the language requires application restart.\n"
@@ -12234,15 +12237,16 @@ msgstr ""
 msgid "Max XY Smoothing"
 msgstr ""
 
+#, no-c-format, no-boost-format
 msgid ""
-"Maximum distance to move points in XY to try to achieve a smooth spiralIf "
+"Maximum distance to move points in XY to try to achieve a smooth spiral. If "
 "expressed as a %, it will be computed over nozzle diameter"
 msgstr ""
 
 msgid "Spiral starting flow ratio"
 msgstr ""
 
-#, possible-c-format, possible-boost-format
+#, no-c-format, no-boost-format
 msgid ""
 "Sets the starting flow ratio while transitioning from the last bottom layer "
 "to the spiral. Normally the spiral transition scales the flow ratio from "
@@ -12253,7 +12257,7 @@ msgstr ""
 msgid "Spiral finishing flow ratio"
 msgstr ""
 
-#, possible-c-format, possible-boost-format
+#, no-c-format, no-boost-format
 msgid ""
 "Sets the finishing flow ratio while ending the spiral. Normally the spiral "
 "transition scales the flow ratio from 100% to 0% during the last loop which "