Merge branch 'SoftFever:main' into main

.github/workflows/build_orca.yml

@@ -58,7 +58,7 @@ jobs:
               if ($versionContent -match 'set\(SoftFever_VERSION "(.*?)"\)') {
                   $ver = $matches[1]
               }
-              ver = "V$ver"
+              $ver = "V$ver"
           }
 
           echo "ver=$ver" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
@@ -215,4 +215,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Linux_${{ env.ver }}
-          path: './build/OrcaSlicer_ubu64.AppImage'
+          path: './build/OrcaSlicer_ubu64.AppImage'

deps/NanoSVG/NanoSVG.cmake

@@ -4,6 +4,7 @@
 # AMD Radeon graphics cards
 
 orcaslicer_add_cmake_project(NanoSVG
-        URL https://github.com/fltk/nanosvg/archive/abcd277ea45e9098bed752cf9c6875b533c0892f.zip
-        URL_HASH SHA256=e859938fbaee4b351bd8a8b3d3c7a75b40c36885ce00b73faa1ce0b98aa0ad34
+    DEPENDS dep_Boost
+    URL https://github.com/SoftFever/nanosvg/archive/863f6aa97ef62028126fa2c19bd4350394c2e15e.zip
+        URL_HASH SHA256=8d9c1624ad6518dd6dfa31e4f8dc7da9ec243d88bae595c7a037450617fec851
 )

localization/i18n/OrcaSlicer.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-18 12:20+0800\n"
+"POT-Creation-Date: 2023-12-19 22:09+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -296,6 +296,12 @@ msgstr ""
 msgid "Cut"
 msgstr ""
 
+msgid "non-mainifold edges be caused by cut tool, do you want to fix it now?"
+msgstr ""
+
+msgid "Repairing model object"
+msgstr ""
+
 msgid "Connector"
 msgstr ""
 
@@ -1329,9 +1335,6 @@ msgstr ""
 msgid "Renaming"
 msgstr ""
 
-msgid "Repairing model object"
-msgstr ""
-
 msgid "Following model object has been repaired"
 msgid_plural "Following model objects have been repaired"
 msgstr[0] ""
@@ -1773,11 +1776,6 @@ msgstr ""
 msgid "Print task sending times out."
 msgstr ""
 
-msgid ""
-"The printer timed out while receiving a print job. Please check if the "
-"network is functioning properly and send the print again."
-msgstr ""
-
 msgid "Service Unavailable"
 msgstr ""
 
@@ -3008,7 +3006,7 @@ msgstr ""
 msgid "Size:"
 msgstr ""
 
-#, possible-boost-format
+#, possible-c-format, possible-boost-format
 msgid ""
 "Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
 "separate the conflicted objects farther (%s <-> %s)."
@@ -4250,7 +4248,7 @@ msgstr ""
 msgid "Allow Prompt Sound"
 msgstr ""
 
-msgid "Fliament Tangle Detect"
+msgid "Filament Tangle Detect"
 msgstr ""
 
 msgid "Global"
@@ -5213,7 +5211,7 @@ msgstr ""
 msgid "User Preset"
 msgstr ""
 
-msgid "Project Inside Preset"
+msgid "Preset Inside Project"
 msgstr ""
 
 msgid "Name is invalid;"
@@ -5701,8 +5699,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 ""
 
 msgid "Line width"
@@ -6075,7 +6073,7 @@ msgstr ""
 msgid "Unsaved Changes"
 msgstr ""
 
-msgid "Discard or Keep changes"
+msgid "Transfer or discard changes"
 msgstr ""
 
 msgid "Old Value"
@@ -6656,6 +6654,9 @@ msgstr ""
 msgid "Idle"
 msgstr ""
 
+msgid "Beta version"
+msgstr ""
+
 msgid "Latest version"
 msgstr ""
 
@@ -8358,10 +8359,10 @@ msgstr ""
 
 msgid ""
 "Fan speed will be ramped up linearly from zero at layer "
-"\"close_fan_the_first_x_layers\" to maximum at layer "
-"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
-"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
-"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
+"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
+"\". \"full_fan_speed_layer\" will be ignored if lower than "
+"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
+"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
 msgstr ""
 
 msgid "Support interface fan speed"
@@ -9560,10 +9561,11 @@ msgid ""
 "filament for support and current filament is used"
 msgstr ""
 
-msgid "Reduce interface filament for base"
+msgid "Avoid interface filament for base"
 msgstr ""
 
-msgid "Avoid using support interface filament to print support base"
+msgid ""
+"Avoid using support interface filament to print support base if possible."
 msgstr ""
 
 msgid ""
@@ -11145,7 +11147,7 @@ msgstr ""
 msgid "All inputs in the custom vendor or serial are spaces. Please re-enter."
 msgstr ""
 
-msgid "The beginning of the vendor can not be a number. Please re-enter."
+msgid "The vendor can not be a number. Please re-enter."
 msgstr ""
 
 msgid ""
@@ -11161,8 +11163,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"We would rename the presets as \"Vendor Type Serial @printer you "
-"selected\". \n"
+"We would rename the presets as \"Vendor Type Serial @printer you selected"
+"\". \n"
 "To add preset for more prinetrs, Please go to printer selection"
 msgstr ""
 

localization/i18n/cs/OrcaSlicer_cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-18 12:20+0800\n"
+"POT-Creation-Date: 2023-12-19 22:09+0800\n"
 "PO-Revision-Date: 2023-09-30 15:15+0200\n"
 "Last-Translator: René Mošner <[email protected]>\n"
 "Language-Team: \n"
@@ -299,6 +299,12 @@ msgstr "Vybrat všechny spojky"
 msgid "Cut"
 msgstr "Řezat"
 
+msgid "non-mainifold edges be caused by cut tool, do you want to fix it now?"
+msgstr ""
+
+msgid "Repairing model object"
+msgstr "Oprava objektu modelu"
+
 msgid "Connector"
 msgstr "Spojka"
 
@@ -1379,9 +1385,6 @@ msgstr "Zadejte nový název"
 msgid "Renaming"
 msgstr "Přejmenování"
 
-msgid "Repairing model object"
-msgstr "Oprava objektu modelu"
-
 msgid "Following model object has been repaired"
 msgid_plural "Following model objects have been repaired"
 msgstr[0] "Následující objekt modelu byl opraven"
@@ -1851,11 +1854,6 @@ msgstr "Odesílání tiskové úlohy prostřednictvím cloudové služby"
 msgid "Print task sending times out."
 msgstr ""
 
-msgid ""
-"The printer timed out while receiving a print job. Please check if the "
-"network is functioning properly and send the print again."
-msgstr ""
-
 msgid "Service Unavailable"
 msgstr "Služba není k dispozici"
 
@@ -3219,7 +3217,7 @@ msgstr "Objem:"
 msgid "Size:"
 msgstr "Velikost:"
 
-#, boost-format
+#, c-format, boost-format
 msgid ""
 "Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please "
 "separate the conflicted objects farther (%s <-> %s)."
@@ -4522,7 +4520,7 @@ msgstr "Automatické obnovení po ztrátě kroku"
 msgid "Allow Prompt Sound"
 msgstr "Povolit zvuky upozornění"
 
-msgid "Fliament Tangle Detect"
+msgid "Filament Tangle Detect"
 msgstr ""
 
 msgid "Global"
@@ -5548,7 +5546,7 @@ msgstr "Uložit %s jako"
 msgid "User Preset"
 msgstr "Uživatelská předvolba"
 
-msgid "Project Inside Preset"
+msgid "Preset Inside Project"
 msgstr "Projekt uvnitř přednastavení"
 
 msgid "Name is invalid;"
@@ -6098,8 +6096,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 ""
 "Při nahrávání časosběru bez nástrojové hlavy se doporučuje přidat  "
 "\"Timelapse Wipe Tower\" \n"
@@ -6511,7 +6509,7 @@ msgstr "Nedefinováno"
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
 
-msgid "Discard or Keep changes"
+msgid "Transfer or discard changes"
 msgstr "Zahodit nebo ponechat změny"
 
 msgid "Old Value"
@@ -7127,6 +7125,9 @@ msgstr "Tisk"
 msgid "Idle"
 msgstr "Nečinný"
 
+msgid "Beta version"
+msgstr ""
+
 msgid "Latest version"
 msgstr "Nejnovější verze"
 
@@ -9119,10 +9120,10 @@ msgstr "Maximální otáčky ventilátoru ve vrstvě"
 
 msgid ""
 "Fan speed will be ramped up linearly from zero at layer "
-"\"close_fan_the_first_x_layers\" to maximum at layer "
-"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower "
-"than \"close_fan_the_first_x_layers\", in which case the fan will be running "
-"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
+"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer"
+"\". \"full_fan_speed_layer\" will be ignored if lower than "
+"\"close_fan_the_first_x_layers\", in which case the fan will be running at "
+"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1."
 msgstr ""
 "Otáčky ventilátoru se lineárně zvýší z nuly ve vrstvě "
 "\"close_fan_first_layers\" na maximum ve vrstvě \"full_fan_speed_layer\". "
@@ -10565,10 +10566,11 @@ msgstr ""
 "Filament pro tiskové podpěry základen a raftu. \"Výchozí\" znamená, že pro  "
 "podpěry není použit žádný konkrétní filament a je použit aktuální filament"
 
-msgid "Reduce interface filament for base"
+msgid "Avoid interface filament for base"
 msgstr ""
 
-msgid "Avoid using support interface filament to print support base"
+msgid ""
+"Avoid using support interface filament to print support base if possible."
 msgstr ""
 
 msgid ""
@@ -12415,7 +12417,7 @@ msgstr ""
 msgid "All inputs in the custom vendor or serial are spaces. Please re-enter."
 msgstr ""
 
-msgid "The beginning of the vendor can not be a number. Please re-enter."
+msgid "The vendor can not be a number. Please re-enter."
 msgstr ""
 
 msgid ""
@@ -12431,8 +12433,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"We would rename the presets as \"Vendor Type Serial @printer you "
-"selected\". \n"
+"We would rename the presets as \"Vendor Type Serial @printer you selected"
+"\". \n"
 "To add preset for more prinetrs, Please go to printer selection"
 msgstr ""
 
@@ -13059,8 +13061,8 @@ msgid ""
 msgstr ""
 "Plochou na podložku\n"
 "Věděli jste, že můžete rychle nastavit orientaci modelu tak, aby jedna z "
-"jeho stěn spočívala na tiskovém podloží? Vyberte funkci \"Plochou na "
-"podložku\" nebo stiskněte klávesu <b>F</b>."
+"jeho stěn spočívala na tiskovém podloží? Vyberte funkci \"Plochou na podložku"
+"\" nebo stiskněte klávesu <b>F</b>."
 
 #: resources/data/hints.ini: [hint:Object List]
 msgid ""