diff --git a/README.md b/README.md
index 209a4428bb..6ed0bd2d64 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,15 @@ Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr
# How to install
**Windows**:
-1. Install and run
+1. Download the installer for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases).
+ - *For convenience there is also a portable build available.*
- *If you have troubles to run the build, you might need to install following runtimes:*
- - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
- - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
+ - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
+ - [Details of this runtime](https://aka.ms/webview2)
+ - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703)
+ - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
+ - [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe)
+ - This file may already be available on your computer if you've installed visual studio. Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
**Mac**:
1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.
@@ -51,16 +56,20 @@ Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr
**Linux(Ubuntu)**:
1. If you run into trouble to execute it, try this command in terminal:
`chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
+
# How to compile
- Windows 64-bit
- Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
+ - You will require cmake version 3.14 or later, which is available [on their website](https://cmake.org/download/).
+ - Strawberry Perl is [available on their github repository](https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/).
- Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
- Mac 64-bit
- Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf
- run `build_release_macos.sh`
-- Ubuntu
+- Ubuntu
+ - Dependencies **Will be auto installed with the shell script**: `libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git`
- run 'sudo ./BuildLinux.sh -u'
- run './BuildLinux.sh -dsir'
diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po
index 6d4aed301c..8c48a8d93b 100644
--- a/localization/i18n/fr/OrcaSlicer_fr.po
+++ b/localization/i18n/fr/OrcaSlicer_fr.po
@@ -33,7 +33,7 @@ msgid "Ctrl + Mouse wheel"
msgstr "Ctrl + Molette de la souris"
msgid "Pen size"
-msgstr "Taille du stylo"
+msgstr "Taille du crayon"
msgid "Left mouse button"
msgstr "Bouton gauche de la souris"
@@ -54,19 +54,19 @@ msgid "Erase"
msgstr "Effacer"
msgid "Erase all painting"
-msgstr "Effacer toute peinture"
+msgstr "Effacer tout"
msgid "Highlight overhang areas"
msgstr "Mettre en surbrillance les zones en surplomb"
msgid "Gap fill"
-msgstr "Remplir les trous"
+msgstr "Remplir les espaces"
msgid "Perform"
msgstr "Exécuter"
msgid "Gap area"
-msgstr "Aire des trous"
+msgstr "Aire des espaces"
msgid "Tool type"
msgstr "Type d'outil"
@@ -90,7 +90,7 @@ msgid "Fill"
msgstr "Remplir"
msgid "Gap Fill"
-msgstr "Remplissage des trous"
+msgstr "Remplissage des espaces"
#, boost-format
msgid "Allows painting only on facets selected by: \"%1%\""
@@ -107,10 +107,10 @@ msgid "Support Generated"
msgstr "Supports générés"
msgid "Gizmo-Place on Face"
-msgstr ""
+msgstr "Gizmo-Placer sur la face"
msgid "Lay on face"
-msgstr "Positionner sur une face"
+msgstr "Poser sur une face"
#, boost-format
msgid ""
@@ -125,7 +125,7 @@ msgid "Color Painting"
msgstr "Mettre en couleur"
msgid "Pen shape"
-msgstr "Forme de stylo"
+msgstr "Forme de crayon"
msgid "Paint"
msgstr "Peindre"
@@ -164,7 +164,7 @@ msgid "Toggle Wireframe"
msgstr "Activer Maillage"
msgid "Shortcut Key "
-msgstr "Touche de raccourci "
+msgstr "Raccourci "
msgid "Triangle"
msgstr "Triangle"
@@ -189,13 +189,13 @@ msgid "Move"
msgstr "Déplacer"
msgid "Gizmo-Move"
-msgstr ""
+msgstr "Gizmo-Déplacer"
msgid "Rotate"
msgstr "Pivoter"
msgid "Gizmo-Rotate"
-msgstr ""
+msgstr "Gizmo-Pivoter"
msgid "Optimize orientation"
msgstr "Optimiser l'orientation"
@@ -207,7 +207,7 @@ msgid "Scale"
msgstr "Redimensionner"
msgid "Gizmo-Scale"
-msgstr ""
+msgstr "Gizmo-Redimensionner"
msgid "Error: Please close all toolbar menus first"
msgstr "Erreur : Veuillez d'abord fermer tous les menus de la barre d'outils"
@@ -274,16 +274,16 @@ msgid "uniform scale"
msgstr "échelle uniforme"
msgid "Planar"
-msgstr ""
+msgstr "Planaire"
msgid "Dovetail"
-msgstr ""
+msgstr "Queue d’aronde"
msgid "Auto"
msgstr "Auto"
msgid "Manual"
-msgstr ""
+msgstr "Manuel"
msgid "Plug"
msgstr "Connecteur"
@@ -292,10 +292,10 @@ msgid "Dowel"
msgstr "Tourillon"
msgid "Snap"
-msgstr ""
+msgstr "Encoche"
msgid "Prism"
-msgstr ""
+msgstr "Prisme"
msgid "Frustum"
msgstr "Tronc"
@@ -307,13 +307,13 @@ msgid "Hexagon"
msgstr "Hexagone"
msgid "Keep orientation"
-msgstr ""
+msgstr "Conserver l’orientation"
msgid "Place on cut"
msgstr "Placer sur la coupe"
msgid "Flip upside down"
-msgstr ""
+msgstr "Retourner à l’envers"
msgid "Connectors"
msgstr "Connecteurs"
@@ -331,19 +331,19 @@ msgstr "Forme"
#. Size in emboss direction
#. TRN - Input label. Be short as possible
msgid "Depth"
-msgstr ""
+msgstr "Profondeur"
msgid "Groove"
-msgstr ""
+msgstr "Rainure"
msgid "Width"
msgstr "Largeur"
msgid "Flap Angle"
-msgstr ""
+msgstr "Angle du rabat"
msgid "Groove Angle"
-msgstr ""
+msgstr "Angle de la rainure"
msgid "Part"
msgstr "Pièce"
@@ -355,21 +355,26 @@ msgid ""
"Click to flip the cut plane\n"
"Drag to move the cut plane"
msgstr ""
+"Cliquer pour retourner le plan de coupe\n"
+"Faire glisser pour déplacer le plan de coupe"
msgid ""
"Click to flip the cut plane\n"
"Drag to move the cut plane\n"
"Right-click a part to assign it to the other side"
msgstr ""
+"Cliquer pour retourner le plan de coupe\n"
+"Faire glisser pour déplacer le plan de coupe\n"
+"Clic droit sur une pièce pour l’affecter à l’autre côté."
msgid "Move cut plane"
-msgstr ""
+msgstr "Déplacer le plan de coupe"
msgid "Mode"
msgstr ""
msgid "Change cut mode"
-msgstr ""
+msgstr "Changer le mode de coupe"
msgid "Tolerance"
msgstr "Tolérance"
@@ -378,7 +383,7 @@ msgid "Drag"
msgstr "Glisser"
msgid "Draw cut line"
-msgstr ""
+msgstr "Tracer la ligne de coupe"
msgid "Left click"
msgstr "Clic gauche"
@@ -408,22 +413,22 @@ msgid "Cut"
msgstr "Couper"
msgid "Rotate cut plane"
-msgstr ""
+msgstr "Rotation du plan de coupe"
msgid "Remove connectors"
msgstr "Retirer les connecteurs"
msgid "Bulge"
-msgstr ""
+msgstr "Renflement"
msgid "Bulge proportion related to radius"
-msgstr ""
+msgstr "Proportion du renflement par rapport au rayon"
msgid "Space"
msgstr "Espace"
msgid "Space proportion related to radius"
-msgstr ""
+msgstr "Proportion de l’espace par rapport au rayon"
msgid "Confirm connectors"
msgstr "Confirmer les connecteurs"
@@ -432,26 +437,26 @@ msgid "Cancel"
msgstr "Annuler"
msgid "Build Volume"
-msgstr ""
+msgstr "Volume d’impression"
msgid "Flip cut plane"
-msgstr ""
+msgstr "Retourner le plan de coupe"
msgid "Groove change"
-msgstr ""
+msgstr "Modifier la rainure"
msgid "Reset"
msgstr "Réinitialiser"
#. TRN: This is an entry in the Undo/Redo stack. The whole line will be 'Edited: (name of whatever was edited)'.
msgid "Edited"
-msgstr ""
+msgstr "Modifié"
msgid "Cut position"
-msgstr ""
+msgstr "Position de coupe"
msgid "Reset cutting plane"
-msgstr ""
+msgstr "Réinitialisation du plan de coupe"
msgid "Edit connectors"
msgstr "Modifier les connecteurs"
@@ -460,10 +465,10 @@ msgid "Add connectors"
msgstr "Ajouter des connecteurs"
msgid "Reset cut"
-msgstr ""
+msgstr "Réinitialiser la coupe"
msgid "Reset cutting plane and remove connectors"
-msgstr ""
+msgstr "Réinitialiser le plan de coupe et retirer les connecteurs"
msgid "Upper part"
msgstr "Partie supérieure"
@@ -495,32 +500,32 @@ msgstr "Connecteurs invalides détectés"
#, c-format, boost-format
msgid "%1$d connector is out of cut contour"
msgid_plural "%1$d connectors are out of cut contour"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le connecteur %1$d est hors du contour de la coupe"
+msgstr[1] "Les connecteurs %1$d sont hors du contour de la coupe"
#, c-format, boost-format
msgid "%1$d connector is out of object"
msgid_plural "%1$d connectors are out of object"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le connecteur %1$d est en-dehors de l’objet"
+msgstr[1] "Les connecteurs %1$d sont en-dehors de l’objet"
msgid "Some connectors are overlapped"
msgstr "Certains connecteurs se chevauchent"
msgid "Select at least one object to keep after cutting."
-msgstr ""
+msgstr "Sélectionnez au moins un objet à conserver après la coupe."
msgid "Cut plane is placed out of object"
-msgstr ""
+msgstr "Le plan de coupe est placé en dehors de l’objet"
msgid "Cut plane with groove is invalid"
-msgstr ""
+msgstr "Le plan de coupe avec rainure est invalide"
msgid "Connector"
msgstr "Connecteur"
msgid "Cut by Plane"
-msgstr ""
+msgstr "Coupe par plan"
msgid "non-manifold edges be caused by cut tool, do you want to fix it now?"
msgstr ""
@@ -531,10 +536,10 @@ msgid "Repairing model object"
msgstr "Réparer l'objet modèle"
msgid "Cut by line"
-msgstr ""
+msgstr "Coupe par ligne"
msgid "Delete connector"
-msgstr ""
+msgstr "Supprimer le connecteur"
msgid "Mesh name"
msgstr "Nom du maillage"
@@ -670,46 +675,46 @@ msgid "Text shape"
msgstr "Forme du texte"
msgid "Set Mirror"
-msgstr ""
+msgstr "Définir la symétrie"
msgid "Embossed text"
-msgstr ""
+msgstr "Texte en relief"
msgid "Enter emboss gizmo"
-msgstr ""
+msgstr "Entrer dans l’outil d’embossage"
msgid "Leave emboss gizmo"
-msgstr ""
+msgstr "Quitter l’outil d’embossage"
msgid "Embossing actions"
-msgstr ""
+msgstr "Actions d’embossage"
msgid "Emboss"
-msgstr ""
+msgstr "Embosser"
msgid "Text-Rotate"
-msgstr ""
+msgstr "Rotation du texte"
msgid "NORMAL"
msgstr ""
msgid "SMALL"
-msgstr ""
+msgstr "PETIT"
msgid "ITALIC"
-msgstr ""
+msgstr "ITALIQUE"
msgid "SWISS"
-msgstr ""
+msgstr "SUISSE"
msgid "MODERN"
-msgstr ""
+msgstr "MODERNE"
msgid "First font"
-msgstr ""
+msgstr "Première police de caractères"
msgid "Default font"
-msgstr ""
+msgstr "Police de caractères par défaut"
msgid "Advanced"
msgstr "Avancé"
@@ -718,142 +723,149 @@ msgid ""
"The text cannot be written using the selected font. Please try choosing a "
"different font."
msgstr ""
+"Le texte ne peut pas être écrit avec la police sélectionnée. Veuillez "
+"essayer de choisir une autre police."
msgid "Embossed text cannot contain only white spaces."
-msgstr ""
+msgstr "Le texte en relief ne peut pas contenir uniquement des espaces blancs."
msgid "Text contains character glyph (represented by '?') unknown by font."
msgstr ""
+"Le texte contient un caractère glyphe (représenté par ‘?’) inconnu de la "
+"police."
msgid "Text input doesn't show font skew."
-msgstr ""
+msgstr "La saisie de texte n’affiche pas l’inclinaison de la police."
msgid "Text input doesn't show font boldness."
-msgstr ""
+msgstr "La saisie de texte n’affiche pas les caractères en gras."
msgid "Text input doesn't show gap between lines."
-msgstr ""
+msgstr "La saisie de texte n’affiche pas d’espace entre les lignes."
msgid "Too tall, diminished font height inside text input."
-msgstr ""
+msgstr "Hauteur de police trop élevée, diminuée dans la saisie de texte."
msgid "Too small, enlarged font height inside text input."
msgstr ""
+"La hauteur de la police est trop petite et trop grande dans la saisie de "
+"texte."
msgid "Text doesn't show current horizontal alignment."
-msgstr ""
+msgstr "Le texte n’affiche pas l’alignement horizontal actuel."
msgid "Revert font changes."
-msgstr ""
+msgstr "Annuler les modifications apportées à la police."
#, boost-format
msgid "Font \"%1%\" can't be selected."
-msgstr ""
+msgstr "La police « %1% » ne peut pas être sélectionnée."
msgid "Operation"
-msgstr ""
+msgstr "Opération"
msgid "Join"
-msgstr ""
+msgstr "Joindre"
msgid "Click to change text into object part."
-msgstr ""
+msgstr "Cliquez pour transformer le texte en partie d’objet."
msgid "You can't change a type of the last solid part of the object."
msgstr ""
+"Vous ne pouvez pas modifier le type de la dernière partie solide de l’objet."
msgctxt "EmbossOperation"
msgid "Cut"
-msgstr ""
+msgstr "Couper"
msgid "Click to change part type into negative volume."
-msgstr ""
+msgstr "Cliquez pour changer le type de pièce en volume négatif."
msgid "Modifier"
msgstr "Modificateur"
msgid "Click to change part type into modifier."
-msgstr ""
+msgstr "Cliquez pour changer le type de pièce en modificateur."
msgid "Change Text Type"
-msgstr ""
+msgstr "Changer le type de texte"
#, boost-format
msgid "Rename style(%1%) for embossing text"
-msgstr ""
+msgstr "Renommer le style (%1%) pour le texte embossé"
msgid "Name can't be empty."
-msgstr ""
+msgstr "Le nom ne peut pas être vide."
msgid "Name has to be unique."
-msgstr ""
+msgstr "Le nom doit être unique."
msgid "OK"
msgstr "OK"
msgid "Rename style"
-msgstr ""
+msgstr "Renommer le style"
msgid "Rename current style."
-msgstr ""
+msgstr "Renommer le style actuel."
msgid "Can't rename temporary style."
-msgstr ""
+msgstr "Impossible de renommer un style provisoire."
msgid "First Add style to list."
-msgstr ""
+msgstr "Ajoutez d’abord le style à la liste."
#, boost-format
msgid "Save %1% style"
-msgstr ""
+msgstr "Enregistrer le style %1%."
msgid "No changes to save."
-msgstr ""
+msgstr "Aucune modification à enregistrer."
msgid "New name of style"
-msgstr ""
+msgstr "Nouveau nom de style"
msgid "Save as new style"
-msgstr ""
+msgstr "Enregistrer comme nouveau style"
msgid "Only valid font can be added to style."
-msgstr ""
+msgstr "Seules les polices valides peuvent être ajoutées au style."
msgid "Add style to my list."
-msgstr ""
+msgstr "Ajouter le style à ma liste."
msgid "Save as new style."
-msgstr ""
+msgstr "Enregistrer comme nouveau style."
msgid "Remove style"
-msgstr ""
+msgstr "Supprimer le style"
msgid "Can't remove the last existing style."
-msgstr ""
+msgstr "Impossible de supprimer le dernier style existant."
#, boost-format
msgid "Are you sure you want to permanently remove the \"%1%\" style?"
-msgstr ""
+msgstr "Êtes-vous sûr de vouloir supprimer définitivement le style « %1% » ?"
#, boost-format
msgid "Delete \"%1%\" style."
-msgstr ""
+msgstr "Supprimer le style \"%1%\"."
#, boost-format
msgid "Can't delete \"%1%\". It is last style."
-msgstr ""
+msgstr "Impossible de supprimer \"%1%\". Il s'agit du dernier style."
#, boost-format
msgid "Can't delete temporary style \"%1%\"."
-msgstr ""
+msgstr "Impossible de supprimer le style provisoire \"%1%\"."
#, boost-format
msgid "Modified style \"%1%\""
-msgstr ""
+msgstr "Style modifié \"%1%\""
#, boost-format
msgid "Current style is \"%1%\""
-msgstr ""
+msgstr "Le style actuel est \"%1%\""
#, boost-format
msgid ""
@@ -861,145 +873,160 @@ msgid ""
"\n"
"Would you like to continue anyway?"
msgstr ""
+"La modification du style en \"%1%\" annulera la modification du style "
+"actuel.\n"
+"\n"
+"Voulez-vous continuer quand même ?"
msgid "Not valid style."
-msgstr ""
+msgstr "Style non valide."
#, boost-format
msgid "Style \"%1%\" can't be used and will be removed from a list."
msgstr ""
+"Le style \"%1%\" ne peut pas être utilisé et sera supprimé de la liste."
msgid "Unset italic"
-msgstr ""
+msgstr "Enlever l’italique"
msgid "Set italic"
-msgstr ""
+msgstr "Mettre en italique"
msgid "Unset bold"
-msgstr ""
+msgstr "Enlever le gars"
msgid "Set bold"
-msgstr ""
+msgstr "Mettre en gras"
msgid "Revert text size."
-msgstr ""
+msgstr "Rétablir la taille du texte."
msgid "Revert embossed depth."
-msgstr ""
+msgstr "Rétablir la profondeur de l’embossage."
msgid ""
"Advanced options cannot be changed for the selected font.\n"
"Select another font."
msgstr ""
+"Les options avancées ne peuvent pas être modifiées pour la police "
+"sélectionnée.\n"
+"Sélectionnez une autre police."
msgid "Revert using of model surface."
-msgstr ""
+msgstr "Rétablir l’utilisation de la surface du modèle."
msgid "Revert Transformation per glyph."
-msgstr ""
+msgstr "Rétablir la transformation par glyphe."
msgid "Set global orientation for whole text."
-msgstr ""
+msgstr "Définir l’orientation globale pour l’ensemble du texte."
msgid "Set position and orientation per glyph."
-msgstr ""
+msgstr "Définir la position et l’orientation par glyphe."
msgctxt "Alignment"
msgid "Left"
-msgstr ""
+msgstr "Gauche"
msgctxt "Alignment"
msgid "Center"
-msgstr ""
+msgstr "Centre"
msgctxt "Alignment"
msgid "Right"
-msgstr ""
+msgstr "Droite"
msgctxt "Alignment"
msgid "Top"
-msgstr ""
+msgstr "Au-dessus"
msgctxt "Alignment"
msgid "Middle"
-msgstr ""
+msgstr "Milieu"
msgctxt "Alignment"
msgid "Bottom"
-msgstr ""
+msgstr "En-dessous"
msgid "Revert alignment."
-msgstr ""
+msgstr "Rétablir l’alignement."
#. TRN EmbossGizmo: font units
msgid "points"
-msgstr ""
+msgstr "points"
msgid "Revert gap between characters"
-msgstr ""
+msgstr "Rétablir l’écart entre les caractères"
msgid "Distance between characters"
-msgstr ""
+msgstr "Distance entre les caractères"
msgid "Revert gap between lines"
-msgstr ""
+msgstr "Rétablir l’écart entre les caractères"
msgid "Distance between lines"
-msgstr ""
+msgstr "Distance entre les lignes"
msgid "Undo boldness"
-msgstr ""
+msgstr "Annuler la mise en gras"
msgid "Tiny / Wide glyphs"
-msgstr ""
+msgstr "Glyphes minuscules / larges"
msgid "Undo letter's skew"
-msgstr ""
+msgstr "Annuler l’inclinaison de la lettre"
msgid "Italic strength ratio"
-msgstr ""
+msgstr "Ratio d’intensité de l’italique"
msgid "Undo translation"
-msgstr ""
+msgstr "Annuler la traduction"
msgid "Distance of the center of the text to the model surface."
-msgstr ""
+msgstr "Distance entre le centre du texte et la surface du modèle."
msgid "Undo rotation"
-msgstr ""
+msgstr "Annuler la rotation"
msgid "Rotate text Clock-wise."
-msgstr ""
+msgstr "Rotation du texte dans le sens des aiguilles d’une montre."
msgid "Unlock the text's rotation when moving text along the object's surface."
msgstr ""
+"Déverrouille la rotation du texte lorsqu’il est déplacé le long de la "
+"surface de l’objet."
msgid "Lock the text's rotation when moving text along the object's surface."
msgstr ""
+"Verrouille la rotation du texte lorsqu’il est déplacé le long de la surface "
+"de l’objet."
msgid "Select from True Type Collection."
-msgstr ""
+msgstr "Sélectionner dans la collection True Type."
msgid "Set text to face camera"
-msgstr ""
+msgstr "Mettre le texte en face de la caméra"
msgid "Orient the text towards the camera."
-msgstr ""
+msgstr "Orienter le texte vers la caméra."
#, boost-format
msgid ""
"Can't load exactly same font(\"%1%\"). Aplication selected a similar "
"one(\"%2%\"). You have to specify font for enable edit text."
msgstr ""
+"Impossible de charger exactement la même police (« %1% »). L’application a "
+"sélectionné une police similaire (« %2% »). Vous devez spécifier la police "
+"pour permettre l’édition du texte."
msgid "No symbol"
-msgstr ""
+msgstr "Pas de symbole"
msgid "Loading"
msgstr "Chargement"
msgid "In queue"
-msgstr ""
+msgstr "Dans la file d’attente"
#. TRN - Input label. Be short as possible
#. Height of one text line - Font Ascent
@@ -1010,35 +1037,35 @@ msgstr "Hauteur"
#. Copy surface of model on surface of the embossed text
#. TRN - Input label. Be short as possible
msgid "Use surface"
-msgstr ""
+msgstr "Utiliser la surface"
#. TRN - Input label. Be short as possible
#. Option to change projection on curved surface
#. for each character(glyph) in text separately
msgid "Per glyph"
-msgstr ""
+msgstr "Par glyphe"
#. TRN - Input label. Be short as possible
#. Align Top|Middle|Bottom and Left|Center|Right
msgid "Alignment"
-msgstr ""
+msgstr "Alignement"
#. TRN - Input label. Be short as possible
msgid "Char gap"
-msgstr ""
+msgstr "Écart entre les caractères"
#. TRN - Input label. Be short as possible
msgid "Line gap"
-msgstr ""
+msgstr "Intervalle de ligne"
#. TRN - Input label. Be short as possible
msgid "Boldness"
-msgstr ""
+msgstr "Épaisseur"
#. TRN - Input label. Be short as possible
#. Like Font italic
msgid "Skew ratio"
-msgstr ""
+msgstr "Ratio d’inclinaison"
#. TRN - Input label. Be short as possible
#. Distance from model surface to be able
@@ -1046,250 +1073,265 @@ msgstr ""
#. move text as modifier fully out of not flat surface
#. TRN - Input label. Be short as possible
msgid "From surface"
-msgstr ""
+msgstr "Depuis la surface"
#. TRN - Input label. Be short as possible
#. Keep vector from bottom to top of text aligned with printer Y axis
msgid "Keep up"
-msgstr ""
+msgstr "Continuer"
#. TRN - Input label. Be short as possible.
#. Some Font file contain multiple fonts inside and
#. this is numerical selector of font inside font collections
msgid "Collection"
-msgstr ""
+msgstr "Collection"
msgid "Enter SVG gizmo"
-msgstr ""
+msgstr "Ouvrir l’outil SVG"
msgid "Leave SVG gizmo"
-msgstr ""
+msgstr "Quitter l’outil SVG"
msgid "SVG actions"
-msgstr ""
+msgstr "Actions SVG"
msgid "SVG"
-msgstr ""
+msgstr "SVG"
#. TRN This is an item label in the undo-redo stack.
msgid "SVG-Rotate"
-msgstr ""
+msgstr "Rotation du SVG"
#, boost-format
msgid "Opacity (%1%)"
-msgstr ""
+msgstr "Opacité (%1%)"
#, boost-format
msgid "Color gradient (%1%)"
-msgstr ""
+msgstr "Dégradé de couleurs (%1%)"
msgid "Undefined fill type"
-msgstr ""
+msgstr "Type de remplissage non défini"
msgid "Linear gradient"
-msgstr ""
+msgstr "Dégradé linéaire"
msgid "Radial gradient"
-msgstr ""
+msgstr "Dégradé radial"
msgid "Open filled path"
-msgstr ""
+msgstr "Ouvrir un chemin rempli"
msgid "Undefined stroke type"
-msgstr ""
+msgstr "Type de trait non défini"
msgid "Path can't be healed from selfintersection and multiple points."
msgstr ""
+"Le chemin ne peut pas être consolidé à partir d’une auto-intersection et de "
+"points multiples."
msgid ""
"Final shape constains selfintersection or multiple points with same "
"coordinate."
msgstr ""
+"La forme finale contient une auto-intersection ou plusieurs points ayant les "
+"mêmes coordonnées."
#, boost-format
msgid "Shape is marked as invisible (%1%)."
-msgstr ""
+msgstr "La forme est marquée comme invisible (%1%)."
#. TRN: The first placeholder is shape identifier, the second one is text describing the problem.
#, boost-format
msgid "Fill of shape (%1%) contains unsupported: %2%."
msgstr ""
+"Le remplissage de la forme (%1%) contient un élément non pris en charge : "
+"%2%."
#, boost-format
msgid "Stroke of shape (%1%) is too thin (minimal width is %2% mm)."
msgstr ""
+"Le trait de la forme (%1%) est trop fin (la largeur minimale est de %2% mm)."
#, boost-format
msgid "Stroke of shape (%1%) contains unsupported: %2%."
msgstr ""
+"Le trait de la forme (%1%) contient un élément non pris en charge : %2%."
msgid "Face the camera"
-msgstr ""
+msgstr "Faire face à la caméra"
#. TRN - Preview of filename after clear local filepath.
msgid "Unknown filename"
-msgstr ""
+msgstr "Nom de fichier inconnu"
#, boost-format
msgid "SVG file path is \"%1%\""
-msgstr ""
+msgstr "Le chemin d'accès au fichier SVG est \"%1%\""
msgid "Reload SVG file from disk."
-msgstr ""
+msgstr "Recharger le fichier SVG à partir du disque."
msgid "Change file"
-msgstr ""
+msgstr "Changer de fichier"
msgid "Change to another .svg file"
-msgstr ""
+msgstr "Changer pour un autre fichier .svg"
msgid "Forget the file path"
-msgstr ""
+msgstr "Oublier le chemin d’accès au fichier"
msgid ""
"Do NOT save local path to 3MF file.\n"
"Also disables 'reload from disk' option."
msgstr ""
+"Ne PAS enregistrer le chemin d'accès local au fichier 3MF.\n"
+"Désactive également l'option \"recharger à partir du disque\"."
#. TRN: An menu option to convert the SVG into an unmodifiable model part.
msgid "Bake"
-msgstr ""
+msgstr "Intégrer"
#. TRN: Tooltip for the menu item.
msgid "Bake into model as uneditable part"
-msgstr ""
+msgstr "Intégrer dans le modèle en tant que partie non modifiable"
msgid "Save as"
-msgstr ""
+msgstr "Enregistrer sous"
msgid "Save SVG file"
-msgstr ""
+msgstr "Enregistrer le fichier SVG"
msgid "Save as '.svg' file"
-msgstr ""
+msgstr "Enregistrer en tant que fichier ‘.svg’"
msgid "Size in emboss direction."
-msgstr ""
+msgstr "Taille dans le sens de l’embossage."
#. TRN: The placeholder contains a number.
#, boost-format
msgid "Scale also changes amount of curve samples (%1%)"
msgstr ""
+"L’échelle modifie également la quantité d’échantillons de la courbe (%1%)."
msgid "Width of SVG."
-msgstr ""
+msgstr "Largeur du SVG."
msgid "Height of SVG."
-msgstr ""
+msgstr "Hauteur du SVG."
msgid "Lock/unlock the aspect ratio of the SVG."
-msgstr ""
+msgstr "Verrouiller/déverrouiller le ratio d’aspect du SVG."
msgid "Reset scale"
-msgstr ""
+msgstr "Remise à zéro de l’échelle"
msgid "Resize"
-msgstr ""
+msgstr "Redimensionner"
msgid "Distance of the center of the SVG to the model surface."
-msgstr ""
+msgstr "Distance entre le centre du SVG et la surface du modèle."
msgid "Reset distance"
-msgstr ""
+msgstr "Réinitialiser la distance"
msgid "Reset rotation"
-msgstr ""
+msgstr "Réinitialiser la rotation"
msgid "Lock/unlock rotation angle when dragging above the surface."
msgstr ""
+"Verrouillage/déverrouillage de l’angle de rotation lorsque l’on tire au-"
+"dessus de la surface."
msgid "Mirror vertically"
-msgstr ""
+msgstr "Symétrie verticale"
msgid "Mirror horizontally"
-msgstr ""
+msgstr "Symétrie horizontale"
#. TRN: This is the name of the action that shows in undo/redo stack (changing part type from SVG to something else).
msgid "Change SVG Type"
-msgstr ""
+msgstr "Changer le type de SVG"
#. TRN - Input label. Be short as possible
msgid "Mirror"
msgstr "Symétrie"
msgid "Choose SVG file for emboss:"
-msgstr ""
+msgstr "Choisir le fichier SVG pour l’embossage :"
#, boost-format
msgid "File does NOT exist (%1%)."
-msgstr ""
+msgstr "Le fichier n’existe pas (%1%)."
#, boost-format
msgid "Filename has to end with \".svg\" but you selected %1%"
msgstr ""
+"Le nom de fichier doit se terminer par \".svg\" mais vous avez sélectionné "
+"%1%."
#, boost-format
msgid "Nano SVG parser can't load from file (%1%)."
-msgstr ""
+msgstr "L’analyseur Nano SVG ne peut pas charger le fichier (%1%)."
#, boost-format
msgid "SVG file does NOT contain a single path to be embossed (%1%)."
-msgstr ""
+msgstr "Le fichier SVG ne contient PAS de chemin unique à embosser (%1%)."
msgid "Vertex"
-msgstr ""
+msgstr "Sommet"
msgid "Edge"
-msgstr ""
+msgstr "Arête"
msgid "Plane"
-msgstr ""
+msgstr "Plan"
msgid "Point on edge"
-msgstr ""
+msgstr "Pointer sur l’arête"
msgid "Point on circle"
-msgstr ""
+msgstr "Pointer sur le cercle"
msgid "Point on plane"
-msgstr ""
+msgstr "Pointer sur le plan"
msgid "Center of edge"
-msgstr ""
+msgstr "Centrer sur l’arête "
msgid "Center of circle"
-msgstr ""
+msgstr "Centrer du cercle"
msgid "ShiftLeft mouse button"
msgstr ""
msgid "Select feature"
-msgstr ""
+msgstr "Sélectionner une fonctionnalité"
msgid "Select point"
-msgstr ""
+msgstr "Sélectionner un point"
msgid "Delete"
msgstr "Supprimer"
msgid "Restart selection"
-msgstr ""
+msgstr "Recommencer la sélection"
msgid "Esc"
msgstr "Échap"
msgid "Unselect"
-msgstr ""
+msgstr "Désélectionner"
msgid "Measure"
-msgstr ""
+msgstr "Mesurer"
msgid "Edit to scale"
-msgstr ""
+msgstr "Modifier à l’échelle"
msgctxt "Verb"
msgid "Scale"
-msgstr ""
+msgstr "Redimensionner"
msgid "None"
msgstr "Aucun"
@@ -1301,19 +1343,19 @@ msgid "Length"
msgstr "Longueur"
msgid "Selection"
-msgstr ""
+msgstr "Sélection"
msgid "Copy to clipboard"
msgstr "Copier dans le presse-papier"
msgid "Perpendicular distance"
-msgstr ""
+msgstr "Distance perpendiculaire"
msgid "Distance"
msgstr ""
msgid "Direct distance"
-msgstr ""
+msgstr "Distance directe"
msgid "Distance XYZ"
msgstr ""
@@ -1492,10 +1534,10 @@ msgstr "Utilisateur déconnecté"
msgid "new or open project file is not allowed during the slicing process!"
msgstr ""
"l’ouverture ou la création d'un fichier de projet n'est pas autorisée "
-"pendant le processus de tranchage !"
+"pendant le processus de découpe !"
msgid "Open Project"
-msgstr "Ouvrir un Projet"
+msgstr "Ouvrir un projet"
msgid ""
"The version of Orca Slicer is too low and needs to be updated to the latest "
@@ -1586,7 +1628,7 @@ msgid "Speed"
msgstr "Vitesse"
msgid "Strength"
-msgstr "Résistance"
+msgstr "Solidité"
msgid "Top Solid Layers"
msgstr "Couches solides supérieures"
@@ -1613,7 +1655,7 @@ msgid "Extrusion Width"
msgstr "Largeur d'Extrusion"
msgid "Wipe options"
-msgstr "Options de nettoyage"
+msgstr "Options d’essuyage"
msgid "Bed adhension"
msgstr "Adhérence au plateau"
@@ -1667,7 +1709,7 @@ msgid "Delete the selected object"
msgstr "Supprimer l'objet sélectionné"
msgid "Load..."
-msgstr "Charger..."
+msgstr "Charger…"
msgid "Cube"
msgstr "Cube"
@@ -1765,13 +1807,13 @@ msgid "active"
msgstr "actif"
msgid "Scale to build volume"
-msgstr "Échelle pour créer du volume"
+msgstr "Adapter la taille au volume d’impression"
msgid "Scale an object to fit the build volume"
-msgstr "Mettre à l'échelle un objet pour l'adapter au volume de construction"
+msgstr "Redimensionner un objet pour l'adapter au volume d’impression"
msgid "Flush Options"
-msgstr "Options de Rinçage"
+msgstr "Options de purge"
msgid "Flush into objects' infill"
msgstr "Purger dans le remplissage d'objet"
@@ -1817,34 +1859,34 @@ msgid "Along X axis"
msgstr "Le long de l'axe X"
msgid "Mirror along the X axis"
-msgstr "Miroir le long de l'axe X"
+msgstr "Symétrie le long de l'axe X"
msgid "Along Y axis"
msgstr "Le long de l'axe Y"
msgid "Mirror along the Y axis"
-msgstr "Miroir le long de l'axe Y"
+msgstr "Symétrie le long de l'axe Y"
msgid "Along Z axis"
msgstr "Le long de l'axe Z"
msgid "Mirror along the Z axis"
-msgstr "Miroir le long de l'axe Z"
+msgstr "Symétrie le long de l'axe Z"
msgid "Mirror object"
-msgstr "Symétriser l'Objet"
+msgstr "Symétriser l’objet"
msgid "Edit text"
msgstr "Modifier le texte"
msgid "Ability to change text, font, size, ..."
-msgstr "Possibilité de modifier le texte, la police, la taille, ..."
+msgstr "Possibilité de modifier le texte, la police, la taille, …"
msgid "Edit SVG"
msgstr "Modifier SVG"
msgid "Change SVG source file, projection, size, ..."
-msgstr "Modifier le fichier source SVG, la projection, la taille, ..."
+msgstr "Modifier le fichier source SVG, la projection, la taille, …"
msgid "Invalidate cut info"
msgstr "Invalider les informations de découpe"
@@ -1944,10 +1986,10 @@ msgid "current"
msgstr "courant"
msgid "Unlock"
-msgstr "Ouvrir"
+msgstr "Déverrouiller"
msgid "Lock"
-msgstr "Bloquer"
+msgstr "Verrouiller"
msgid "Edit Plate Name"
msgstr "Modifier le nom du plateau"
@@ -2307,7 +2349,7 @@ msgid "Add Custom Template"
msgstr "Ajouter un Modèle Personnalisé"
msgid "Insert template custom G-code at the beginning of this layer."
-msgstr "Insérer un modèle de G-code personnalisé au début de cette couche."
+msgstr "Insérer un G-code personnalisé au début de cette couche."
msgid "Filament "
msgstr "Filament "
@@ -2400,7 +2442,7 @@ msgid "Retry"
msgstr "Réessayer"
msgid "Calibrating AMS..."
-msgstr "Étalonnage de l'AMS..."
+msgstr "Étalonnage de l'AMS…"
msgid "A problem occured during calibration. Click to view the solution."
msgstr ""
@@ -2471,7 +2513,7 @@ msgstr ""
"nous ne pouvons pas faire d'auto-arrangement sur cette plaque."
msgid "Arranging..."
-msgstr "Organiser..."
+msgstr "Organiser…"
msgid "Arranging"
msgstr "Agencement"
@@ -2519,7 +2561,7 @@ msgstr ""
"cette plaque."
msgid "Orienting..."
-msgstr "Orienter..."
+msgstr "Orienter…"
msgid "Orienting"
msgstr "Orienter"
@@ -2556,7 +2598,7 @@ msgstr "Vérifiez la connexion réseau de l'imprimante."
msgid "Abnormal print file data. Please slice again."
msgstr ""
-"Données de fichier d'impression anormales, veuillez retrancher le fichier."
+"Données de fichier d'impression anormales, veuillez redécouvre le fichier."
msgid "Task canceled."
msgstr "Tâche annulée."
@@ -2570,14 +2612,14 @@ msgid "Cloud service connection failed. Please try again."
msgstr "La connexion au service cloud a échoué. Veuillez réessayer."
msgid "Print file not found. please slice again."
-msgstr "Fichier d'impression introuvable, veuillez le retrancher."
+msgstr "Fichier d'impression introuvable, veuillez le redécouvre."
msgid ""
"The print file exceeds the maximum allowable size (1GB). Please simplify the "
"model and slice again."
msgstr ""
"Le fichier d'impression dépasse la taille maximale autorisée (1 Go). "
-"Veuillez simplifier le modèle puis le retrancher."
+"Veuillez simplifier le modèle puis le redécouvre."
msgid "Failed to send the print job. Please try again."
msgstr "L'envoi de la tâche d'impression a échoué. Veuillez réessayer."
@@ -2600,7 +2642,7 @@ msgstr ""
msgid "Print file not found, Please slice it again and send it for printing."
msgstr ""
-"Fichier d'impression introuvable, retranchez le et renvoyez le pour "
+"Fichier d'impression introuvable, redécoupez-le et renvoyez-le pour "
"impression."
msgid ""
@@ -2899,7 +2941,7 @@ msgstr "Exemple"
#, c-format, boost-format
msgid "Calibrating... %d%%"
-msgstr "Calibration...%d%%"
+msgstr "Calibration… %d%%"
msgid "Calibration completed"
msgstr "Calibration terminé"
@@ -3102,7 +3144,7 @@ msgstr ""
"de filament lorsque la bobine actuelle est épuisé"
msgid "File"
-msgstr "Dossier"
+msgstr "Fichier"
msgid "Calibration"
msgstr "Calibration"
@@ -3148,7 +3190,7 @@ msgid "Please save project and restart the program. "
msgstr "Veuillez enregistrer le projet et redémarrer le programme. "
msgid "Processing G-Code from Previous file..."
-msgstr "Traitement du G-Code du fichier précédent..."
+msgstr "Traitement du G-Code du fichier précédent…"
msgid "Slicing complete"
msgstr "Découpe terminée"
@@ -3229,7 +3271,7 @@ msgid "Circular"
msgstr "Circulaire"
msgid "Load shape from STL..."
-msgstr "Charger une forme depuis un STL..."
+msgstr "Charger une forme depuis un STL…"
msgid "Settings"
msgstr "Réglages"
@@ -3813,7 +3855,7 @@ msgid "Seams"
msgstr "Coutures"
msgid "Retract"
-msgstr "Se rétracter"
+msgstr "Rétraction"
msgid "Unretract"
msgstr "Annuler le retrait"
@@ -3822,7 +3864,7 @@ msgid "Filament Changes"
msgstr "Changements de filaments"
msgid "Wipe"
-msgstr "Nettoyer"
+msgstr "Essuyage"
msgid "Options"
msgstr "Choix"
@@ -3927,7 +3969,7 @@ msgid "Sequence"
msgstr "Séquence"
msgid "Mirror Object"
-msgstr "Symétriser l'Objet"
+msgstr "Symétriser l’objet"
msgid "Tool Move"
msgstr "Déplacement d'outil"
@@ -4133,7 +4175,7 @@ msgid "Invalid input."
msgstr "Saisie non valide."
msgid "New Window"
-msgstr "Nouvelle Fenêtre"
+msgstr "Nouvelle fenêtre"
msgid "Open a new window"
msgstr "Ouvrir une nouvelle fenêtre"
@@ -4170,13 +4212,13 @@ msgid "will be closed before creating a new model. Do you want to continue?"
msgstr "sera fermé avant de créer un nouveau modèle. Voulez-vous continuer ?"
msgid "Slice plate"
-msgstr "Trancher le plateau"
+msgstr "Découper le plateau"
msgid "Print plate"
msgstr "Imprimer plateau"
msgid "Slice all"
-msgstr "Tout trancher"
+msgstr "Tout découper"
msgid "Export G-code file"
msgstr "Exporter le fichier G-code"
@@ -4185,10 +4227,10 @@ msgid "Send"
msgstr "Envoyer"
msgid "Export plate sliced file"
-msgstr "Exporter fichier tranché du plateau"
+msgstr "Exporter fichier découpé du plateau"
msgid "Export all sliced file"
-msgstr "Exporter tous les fichiers tranchés"
+msgstr "Exporter tous les fichiers découpés"
msgid "Print all"
msgstr "Tout imprimer"
@@ -4272,7 +4314,7 @@ msgid "Start a new window"
msgstr "Démarrer une nouvelle fenêtre"
msgid "New Project"
-msgstr "Nouveau Projet"
+msgstr "Nouveau projet"
msgid "Start a new project"
msgstr "Démarrer un nouveau projet"
@@ -4326,7 +4368,7 @@ msgid "Export 3mf file without using some 3mf-extensions"
msgstr "Exportation de fichiers 3MF sans utiliser d'extensions"
msgid "Export current sliced file"
-msgstr "Exporter le fichier tranché actuel"
+msgstr "Exporter le fichier découpé actuel"
msgid "Export all plate sliced file"
msgstr "Exportation de tous les fichiers slicés de la plaque"
@@ -4377,7 +4419,7 @@ msgid "Deletes the current selection"
msgstr "Supprime la sélection en cours"
msgid "Delete all"
-msgstr "Tout Supprimer"
+msgstr "Tout supprimer"
msgid "Deletes all objects"
msgstr "Supprimer tous les objets"
@@ -4419,13 +4461,13 @@ msgid "Reset to default window layout"
msgstr "Rétablissement de la disposition par défaut des fenêtres"
msgid "Show &Labels"
-msgstr "Afficher &Les Étiquettes"
+msgstr "Afficher &les étiquettes"
msgid "Show object labels in 3D scene"
msgstr "Afficher les étiquettes des objets dans la scène 3D"
msgid "Show &Overhang"
-msgstr "Montrer Surplombs"
+msgstr "Montrer les &surplombs"
msgid "Show object overhang highlight in 3D scene"
msgstr "Afficher la surbrillance des surplombs d'un objet dans la scène 3D"
@@ -4434,7 +4476,7 @@ msgid "Preferences"
msgstr "Préférences"
msgid "View"
-msgstr "Vue"
+msgstr "Affichage"
msgid "Help"
msgstr "Aide"
@@ -4628,7 +4670,7 @@ msgstr ""
"Échec de l'initialisation (adresse IP réseau manquante de l'imprimante) !"
msgid "Initializing..."
-msgstr "Initialisation..."
+msgstr "Initialisation…"
#, c-format, boost-format
msgid "Initialize failed (%s)!"
@@ -4646,7 +4688,7 @@ msgstr "Arrêté."
msgid "LAN Connection Failed (Failed to start liveview)"
msgstr ""
-"Échec de la connexion au réseau local (échec du démarrage de la vue en "
+"Échec de la connexion au réseau local (échec du démarrage de l’affichage en "
"direct)"
msgid ""
@@ -4683,7 +4725,7 @@ msgid "Load failed [%d]!"
msgstr "Le chargement a échoué [%d] !"
msgid "Loading..."
-msgstr "Chargement..."
+msgstr "Chargement…"
msgid "Year"
msgstr "Année"
@@ -4704,7 +4746,7 @@ msgid "Show all files, recent first."
msgstr "Afficher tous les fichiers, les plus récents en premier."
msgid "Timelapse"
-msgstr "Laps de temps"
+msgstr "Timelapse"
msgid "Switch to timelapse files."
msgstr "Passez aux fichiers timelapse."
@@ -4741,7 +4783,7 @@ msgid "Connect failed [%d]!"
msgstr "La connexion a échoué [%d] !"
msgid "Loading file list..."
-msgstr "Chargement de la liste des fichiers..."
+msgstr "Chargement de la liste des fichiers…"
#, c-format, boost-format
msgid "No files [%d]"
@@ -4773,7 +4815,7 @@ msgid "Delete file"
msgstr "Supprimer le fichier"
msgid "Fetching model infomations ..."
-msgstr "Récupération des informations sur le modèle..."
+msgstr "Récupération des informations sur le modèle…"
msgid "Failed to fetching model infomations from printer."
msgstr ""
@@ -4794,7 +4836,7 @@ msgid "File '%s' was lost! Please download it again."
msgstr "Le fichier « %s » a été perdu ! Veuillez le télécharger à nouveau."
msgid "Download waiting..."
-msgstr "Téléchargement en attente..."
+msgstr "Téléchargement en attente…"
msgid "Play"
msgstr "Lecture"
@@ -4960,11 +5002,11 @@ msgid "Downloading..."
msgstr "Téléchargement…"
msgid "Cloud Slicing..."
-msgstr "Tranchage Cloud..."
+msgstr "Découpe par le Cloud..."
#, c-format, boost-format
msgid "In Cloud Slicing Queue, there are %s tasks ahead."
-msgstr "Dans la file d'attente des tranchage cloud %s tâches vous attendent."
+msgstr "Dans la file d’attente Cloud Slicing, il reste %s tâches en attente."
#, c-format, boost-format
msgid "Layer: %s"
@@ -5218,8 +5260,8 @@ msgstr[1] " %1$d objets ont des supports personnalisés."
#, c-format, boost-format
msgid "%1$d Object has color painting."
msgid_plural "%1$d Objects have color painting."
-msgstr[0] "%1$d L'objet est peint en couleur."
-msgstr[1] "%1$d L'objets sont peints en couleur."
+msgstr[0] "%1$d L'objet est mis en couleur."
+msgstr[1] "%1$d L'objets sont mis en couleur."
#, c-format, boost-format
msgid "%1$d object was loaded as a part of cut object."
@@ -5274,10 +5316,10 @@ msgid "Gcode path overlap"
msgstr "Chevauchement de chemin G-code"
msgid "Support painting"
-msgstr "Soutenir la peinture"
+msgstr "Peindre les supports"
msgid "Color painting"
-msgstr "Peinture couleur"
+msgstr "Mettre en couleur"
msgid "Cut connectors"
msgstr "Connecteurs de découpe"
@@ -5426,7 +5468,7 @@ msgid "Bed type"
msgstr "Type de plaque"
msgid "Flushing volumes"
-msgstr "Volumes de rinçage"
+msgstr "Volumes de purge"
msgid "Add one filament"
msgstr "Ajouter un filament"
@@ -5744,11 +5786,11 @@ msgid "Invalid data"
msgstr "Donnée non valide"
msgid "Slicing Canceled"
-msgstr "Tranchage Annulé"
+msgstr "Découpe annulée"
#, c-format, boost-format
msgid "Slicing Plate %d"
-msgstr "Tranchage plateau %d"
+msgstr "Découpe du plateau %d"
msgid "Please resolve the slicing errors and publish again."
msgstr "Veuillez résoudre les erreurs de découpage et republier."
@@ -6063,7 +6105,7 @@ msgid "Stealth Mode"
msgstr "Mode privé"
msgid "Check for stable updates only"
-msgstr ""
+msgstr "Vérifier les mises à jour stables uniquement"
msgid "Metric"
msgstr "Métrique"
@@ -6382,7 +6424,7 @@ msgstr "Déconnexion"
msgid "Slice all plate to obtain time and filament estimation"
msgstr ""
-"Tranchez toutes les couches pour obtenir une estimation du temps et du "
+"Découpez toutes les couches pour obtenir une estimation du temps et du "
"filament"
msgid "Packing project data into 3mf file"
@@ -6405,7 +6447,7 @@ msgid "Publish was cancelled"
msgstr "La publication a été annulée"
msgid "Slicing Plate 1"
-msgstr "Trancher Plaque 1"
+msgstr "Découper Plaque 1"
msgid "Packing data to 3mf"
msgstr "Collecte des données 3mf"
@@ -6701,7 +6743,7 @@ msgid ""
msgstr ""
"Le type d'imprimante sélectionné lors de la génération du G-Code n'est pas "
"cohérent avec l'imprimante actuellement sélectionnée. Il est recommandé "
-"d'utiliser le même type d'imprimante pour le tranchage."
+"d'utiliser le même type d'imprimante pour la découpe."
msgid ""
"There are some unknown filaments in the AMS mappings. Please check whether "
@@ -6753,7 +6795,7 @@ msgstr "Préparation du travail d'impression"
msgid "Abnormal print file data. Please slice again"
msgstr ""
-"Données de fichier d'impression anormales. Veuillez retrancher le fichier."
+"Données de fichier d'impression anormales. Veuillez redécouvre le fichier."
msgid "The name length exceeds the limit."
msgstr "La longueur du nom dépasse la limite."
@@ -6772,7 +6814,7 @@ msgid "Modifying the device name"
msgstr "Modification du nom de l'appareil"
msgid "Send to Printer SD card"
-msgstr "Envoyer à la carte SD de l'imprimante"
+msgstr "Envoyer sur la carte SD de l'imprimante"
msgid "Cannot send the print task when the upgrade is in progress"
msgstr ""
@@ -6791,7 +6833,7 @@ msgid "The printer does not support sending to printer SD card."
msgstr "L'imprimante ne prend pas en charge l'envoi vers la carte SD."
msgid "Slice ok."
-msgstr "Tranchage terminé."
+msgstr "Découpe terminée."
msgid "View all Daily tips"
msgstr "Voir toutes les Astuces quotidiennes"
@@ -6962,7 +7004,7 @@ msgid ""
"We recommend using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
"Nous avons ajouté un style expérimental « Arborescent Fin » qui offre un "
-"volume de support plus petit mais également une résistance plus faible.\n"
+"volume de support plus petit mais également une solidité plus faible.\n"
"Nous recommandons de l'utiliser avec : 0 couches d'interface, 0 distance "
"supérieure, 2 parois."
@@ -7000,6 +7042,9 @@ msgid ""
"Layer height is too small.\n"
"It will set to min_layer_height\n"
msgstr ""
+"La hauteur du calque est trop faible.\n"
+"Elle sera définie à min_layer_height\n"
+"\n"
msgid ""
"Layer height exceeds the limit in Printer Settings -> Extruder -> Layer "
@@ -7021,13 +7066,13 @@ msgstr "Ignorer"
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 ""
"Lorsque vous enregistrez un timelapse sans tête d’outil, il est recommandé "
-"d’ajouter une \"Tour de nettoyage timelapse\".\n"
+"d’ajouter une \"Tour d’essuyage timelapse\".\n"
"en faisant un clic droit sur un emplacement vide sur le plateau et en "
-"choisissant \"Ajouter Primitive\"-> \"Tour de nettoyage Timelapse\"."
+"choisissant \"Ajouter Primitive\"-> \"Tour d’essuyage timelapse\"."
msgid "Line width"
msgstr "Largeur de ligne"
@@ -7174,9 +7219,9 @@ msgid ""
"Bed temperature when cool plate is installed. Value 0 means the filament "
"does not support to print on the Cool Plate"
msgstr ""
-"Il s'agit de la température du plateau lorsque le plateau froid (\"Cool plate"
-"\") est installé. Une valeur à 0 signifie que ce filament ne peut pas être "
-"imprimé sur le plateau froid."
+"Il s'agit de la température du plateau lorsque le plateau froid (\"Cool "
+"plate\") est installé. Une valeur à 0 signifie que ce filament ne peut pas "
+"être imprimé sur le plateau froid."
msgid "Engineering plate"
msgstr "Plaque Engineering"
@@ -7223,7 +7268,7 @@ msgid "Cooling for specific layer"
msgstr "Refroidissement pour une couche spécifique"
msgid "Part cooling fan"
-msgstr "Ventilateur de refroidissement partiel"
+msgstr "Ventilateur de refroidissement des pièces"
msgid "Min fan speed threshold"
msgstr "Seuil de vitesse mini du ventilateur"
@@ -7234,7 +7279,7 @@ msgid ""
"shorter than threshold, fan speed is interpolated between the minimum and "
"maximum fan speed according to layer printing time"
msgstr ""
-"La vitesse du ventilateur de refroidissement partiel commencera à "
+"La vitesse du ventilateur de refroidissement des pièces commencera à "
"fonctionner à la vitesse minimale lorsque le temps de couche estimé n'est "
"pas supérieur au temps de couche dans le réglage. Lorsque le temps de couche "
"est inférieur au seuil, la vitesse du ventilateur est interpolée entre la "
@@ -7248,11 +7293,11 @@ msgid ""
"Part cooling fan speed will be max when the estimated layer time is shorter "
"than the setting value"
msgstr ""
-"La vitesse du ventilateur de refroidissement partiel sera maximale lorsque "
-"le temps de couche estimé est plus court que la valeur de réglage"
+"La vitesse du ventilateur de refroidissement des pièces sera maximale "
+"lorsque le temps de couche estimé est plus court que la valeur de réglage"
msgid "Auxiliary part cooling fan"
-msgstr "Ventilateur de refroidissement de la partie auxiliaire"
+msgstr "Ventilateur de refroidissement auxiliaire"
msgid "Exhaust fan"
msgstr "Ventilateur d’extraction"
@@ -7324,16 +7369,16 @@ msgid "Time lapse G-code"
msgstr "G-code de Timelapse"
msgid "Change filament G-code"
-msgstr "Changer le G-code du filament"
+msgstr "G-code de changement de filament"
msgid "Change extrusion role G-code"
msgstr "G-code de changement du rôle de l’extrusion"
msgid "Pause G-code"
-msgstr "Mettre le G-code en pause"
+msgstr "G-code de mise en pause"
msgid "Template Custom G-code"
-msgstr "Modèle G-code personnalisé"
+msgstr "G-code personnalisé"
msgid "Motion ability"
msgstr "Capacité de mouvement"
@@ -7687,19 +7732,22 @@ msgid "Re-calculate"
msgstr "Re-calculer"
msgid "Flushing volumes for filament change"
-msgstr "Volumes de rinçage pour le changement de filament"
+msgstr "Volumes de purge pour le changement de filament"
msgid ""
"Orca would re-calculate your flushing volumes everytime the filaments color "
"changed. You could disable the auto-calculate in Orca Slicer > Preferences"
msgstr ""
+"Orca recalcule les volumes de purge à chaque fois que la couleur des "
+"filaments change. Vous pouvez désactiver le calcul automatique dans Orca "
+"Slicer > Préférences"
msgid "Flushing volume (mm³) for each filament pair."
-msgstr "Volume de rinçage (mm³) pour chaque paire de filaments."
+msgstr "Volume de purge (mm³) pour chaque paire de filaments."
#, c-format, boost-format
msgid "Suggestion: Flushing Volume in range [%d, %d]"
-msgstr "Suggestion : Volume de rinçage dans la plage [%d, %d]."
+msgstr "Suggestion : Volume de purge dans la plage [%d, %d]."
#, c-format, boost-format
msgid "The multiplier should be in range [%.2f, %.2f]."
@@ -7897,25 +7945,25 @@ msgid "Select all objects"
msgstr "Sélectionner tous les objets"
msgid "Gizmo move"
-msgstr "Mouvement Gizmo"
+msgstr "Gizmo déplacer"
msgid "Gizmo scale"
-msgstr "Échelle Gizmo"
+msgstr "Gizmo redimensionner"
msgid "Gizmo rotate"
-msgstr "Rotation Gizmo"
+msgstr "Gizmo pivoter"
msgid "Gizmo cut"
-msgstr "Découpe Gizmo"
+msgstr "Gizmo couper"
msgid "Gizmo Place face on bed"
-msgstr "Placer Gizmo sur le plateau"
+msgstr "Gizmo Placer la face sur le plateau"
msgid "Gizmo SLA support points"
-msgstr "Points de supports Gizmo SLA"
+msgstr "Gizmo Point de support SLA"
msgid "Gizmo FDM paint-on seam"
-msgstr "Couture peinte Gizmo FDM"
+msgstr "Gizmo Peinture de la couture FDM"
msgid "Switch between Prepare/Preview"
msgstr "Basculer entre Préparer/Aperçu"
@@ -7945,7 +7993,7 @@ msgid "Alt+Mouse wheel"
msgstr "Alt+Molette de la souris"
msgid "Gizmo"
-msgstr "Bidule"
+msgstr "Gizmo"
msgid "Set extruder number for the objects and parts"
msgstr "Définir le numéro d'extrudeuse pour les objets et les pièces"
@@ -8130,7 +8178,7 @@ msgstr ""
"La version du firmware est erronée. La réparation et la mise à jour sont "
"nécessaires avant l'impression. Voulez-vous effectuer la mise à jour "
"maintenant ? Vous pouvez également effectuer une mise à jour ultérieurement "
-"depuis l'imprimante ou lors du prochain démarrage de Orca Slicer."
+"depuis l'imprimante ou lors du prochain démarrage d'Orca Slicer."
msgid "Extension Board"
msgstr "Carte d'Extension"
@@ -8457,15 +8505,15 @@ msgstr ""
#, boost-format
msgid "The object %1% exceeds the maximum build volume height."
-msgstr "L’objet %1% dépasse la hauteur maximale du volume de construction."
+msgstr "L’objet %1% dépasse la hauteur maximale du volume d’impression."
#, boost-format
msgid ""
"While the object %1% itself fits the build volume, its last layer exceeds "
"the maximum build volume height."
msgstr ""
-"Bien que l’objet %1% s’adapte lui-même au volume de construction, sa "
-"dernière couche dépasse la hauteur maximale du volume de construction."
+"Bien que l’objet %1% s’adapte lui-même au volume d’impression, sa dernière "
+"couche dépasse la hauteur maximale du volume de construction."
msgid ""
"You might want to reduce the size of your model or change current print "
@@ -8508,8 +8556,8 @@ msgstr ""
msgid "The prime tower is not supported in \"By object\" print."
msgstr ""
-"La tour de nettoyage n'est pas prise en charge dans l'impression \"Par objet"
-"\"."
+"La tour de nettoyage n'est pas prise en charge dans l'impression \"Par "
+"objet\"."
msgid ""
"The prime tower is not supported when adaptive layer height is on. It "
@@ -8684,7 +8732,7 @@ msgid ""
"Slicing height for each layer. Smaller layer height means more accurate and "
"more printing time"
msgstr ""
-"Hauteur de tranchage pour chaque couche. Une hauteur de couche plus petite "
+"Hauteur de découpe pour chaque couche. Une hauteur de couche plus petite "
"signifie plus de précision et plus de temps d'impression"
msgid "Printable height"
@@ -8950,7 +8998,7 @@ msgid ""
"wall which has large overhang degree. Forcing cooling for overhang and "
"bridge can get better quality for these part"
msgstr ""
-"Forcez le ventilateur de refroidissement de la pièce à être à cette vitesse "
+"Forcez le ventilateur de refroidissement des pièces à être à cette vitesse "
"lors de l'impression d'un pont ou d'une paroi en surplomb qui a un degré de "
"surplomb important. Forcer le refroidissement pour les surplombs et le pont "
"pour obtenir une meilleure qualité pour ces pièces."
@@ -9056,7 +9104,6 @@ msgstr ""
msgid "One wall threshold"
msgstr "Seuil de paroi unique"
-#, fuzzy, c-format, boost-format
msgid ""
"If a top surface has to be printed and it's partially covered by another "
"layer, it won't be considered at a top layer where its width is below this "
@@ -9157,7 +9204,6 @@ msgstr "Seuil d’inversion"
msgid "Overhang reversal threshold"
msgstr "Seuil d’inversion des surplombs"
-#, fuzzy, c-format, boost-format
msgid ""
"Number of mm the overhang need to be for the reversal to be considered "
"useful. Can be a % of the perimeter width.\n"
@@ -9242,26 +9288,26 @@ msgstr ""
"le retrait du bord"
msgid "Brim ears"
-msgstr "Oreilles de bordure"
+msgstr "Bordures à oreilles"
msgid "Only draw brim over the sharp edges of the model."
-msgstr "Bordure que sur les arêtes vives du modèle."
+msgstr "Ne tracer la bordure que sur les arêtes vives du modèle."
msgid "Brim ear max angle"
-msgstr "Angle maximum de la bordure"
+msgstr "Angle maximum de la bordure à oreilles"
msgid ""
"Maximum angle to let a brim ear appear. \n"
"If set to 0, no brim will be created. \n"
"If set to ~180, brim will be created on everything but straight sections."
msgstr ""
-"Angle maximum pour laisser apparaître la bordure.\n"
+"Angle maximum pour laisser apparaître la bordure à oreilles.\n"
"S’il est défini sur 0, aucune bordure ne sera créée.\n"
"S’il est réglé sur ~180, la bordure sera créée sur tout sauf les sections "
"droites."
msgid "Brim ear detection radius"
-msgstr "Rayon de détection de la bordure"
+msgstr "Rayon de détection de la bordure à oreilles"
msgid ""
"The geometry will be decimated before dectecting sharp angles. This "
@@ -9443,8 +9489,8 @@ msgid ""
"thickness (top+bottom solid layers)"
msgstr ""
"Ajoutez du remplissage solide à proximité des surfaces inclinées pour "
-"garantir l'épaisseur verticale de la coque (couches solides supérieure"
-"+inférieure)."
+"garantir l'épaisseur verticale de la coque (couches solides "
+"supérieure+inférieure)."
msgid "Top surface pattern"
msgstr "Motif de surface supérieure"
@@ -9701,7 +9747,7 @@ msgid ""
"If enable this setting, part cooling fan will never be stoped and will run "
"at least at minimum speed to reduce the frequency of starting and stoping"
msgstr ""
-"Si ce paramètre est activé, le ventilateur de refroidissement partiel ne "
+"Si ce paramètre est activé, le ventilateur de refroidissement des pièces ne "
"sera jamais arrêté et fonctionnera au moins à la vitesse minimale pour "
"réduire la fréquence de démarrage et d'arrêt"
@@ -9713,9 +9759,9 @@ msgid ""
"shorter than this value. Fan speed is interpolated between the minimum and "
"maximum fan speeds according to layer printing time"
msgstr ""
-"Le ventilateur de refroidissement partiel sera activé pour les couches dont "
-"le temps estimé est inférieur à cette valeur. La vitesse du ventilateur est "
-"interpolée entre les vitesses minimale et maximale du ventilateur en "
+"Le ventilateur de refroidissement des pièces sera activé pour les couches "
+"dont le temps estimé est inférieur à cette valeur. La vitesse du ventilateur "
+"est interpolée entre les vitesses minimale et maximale du ventilateur en "
"fonction du temps d'impression de la couche"
msgid "Default color"
@@ -9779,10 +9825,9 @@ msgstr ""
msgid "Shrinkage"
msgstr "Pourcentage de retrait"
-#, fuzzy, c-format, boost-format
msgid ""
-"Enter the shrinkage percentage that the filament will get after cooling "
-"(94% if you measure 94mm instead of 100mm). The part will be scaled in xy to "
+"Enter the shrinkage percentage that the filament will get after cooling (94% "
+"if you measure 94mm instead of 100mm). The part will be scaled in xy to "
"compensate. Only the filament used for the perimeter is taken into account.\n"
"Be sure to allow enough space between objects, as this compensation is done "
"after the checks."
@@ -10012,7 +10057,6 @@ msgstr ""
msgid "Sparse infill density"
msgstr "Densité de remplissage"
-#, fuzzy, c-format, boost-format
msgid ""
"Density of internal sparse infill, 100% turns all sparse infill into solid "
"infill and internal solid infill pattern will be used"
@@ -10266,10 +10310,10 @@ msgstr "Ventilateur à pleine vitesse à la couche"
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 ""
"La vitesse du ventilateur augmentera de manière linéaire à partir de zéro à "
"la couche \"close_fan_the_first_x_layers\" jusqu’au maximum à la couche "
@@ -10348,11 +10392,11 @@ msgid ""
"Speed of gap infill. Gap usually has irregular line width and should be "
"printed more slowly"
msgstr ""
-"Vitesse de remplissage des interstices. L'écart a généralement une largeur "
-"de ligne irrégulière et doit être imprimé plus lentement"
+"Vitesse de remplissage des espaces. L’espace a généralement une largeur de "
+"ligne irrégulière et doit être imprimé plus lentement"
msgid "Arc fitting"
-msgstr "Raccord en arc"
+msgstr "Tracer des arcs"
msgid ""
"Enable this to get a G-code file which has G2 and G3 moves. And the fitting "
@@ -10409,7 +10453,7 @@ msgid ""
"slicing."
msgstr ""
"La dureté de la buse. Zéro signifie qu'il n'est pas nécessaire de vérifier "
-"la dureté de la buse pendant le tranchage."
+"la dureté de la buse pendant la découpe."
msgid "HRC"
msgstr "HRC"
@@ -10544,8 +10588,8 @@ msgstr ""
"Permet d’ajouter des commentaires dans le G-code sur les mouvements "
"d’impression de l’objet auquel ils appartiennent, ce qui est utile pour le "
"plug-in Octoprint CancelObject. Ce paramètre n’est PAS compatible avec la "
-"configuration multi-matériaux avec un seul extrudeur et Purger dans "
-"l’objet / Purger dans le remplissage."
+"configuration multi-matériaux avec un seul extrudeur et Essuyer dans "
+"l’objet / Essuyer dans le remplissage."
msgid "Exclude objects"
msgstr "Exclure des objets"
@@ -10838,7 +10882,7 @@ msgid ""
"Part cooling fan speed may be increased when auto cooling is enabled. This "
"is the maximum speed limitation of part cooling fan"
msgstr ""
-"La vitesse du ventilateur de refroidissement partiel peut être augmentée "
+"La vitesse du ventilateur de refroidissement des pièces peut être augmentée "
"lorsque le refroidissement automatique est activé. Il s'agit de la "
"limitation de vitesse maximale du ventilateur de refroidissement partiel"
@@ -10941,7 +10985,7 @@ msgstr ""
"Valeurs autorisées : 1-5"
msgid "Minimum speed for part cooling fan"
-msgstr "Vitesse minimale du ventilateur de refroidissement partiel"
+msgstr "Vitesse minimale du ventilateur de refroidissement des pièces"
msgid ""
"Speed of auxiliary part cooling fan. Auxiliary fan will run at this speed "
@@ -11087,7 +11131,7 @@ msgstr ""
"Ne pas effectuer de rétraction lors de déplacement en zone de remplissage "
"car même si l’extrudeur suinte, les coulures ne seraient pas visibles. Cela "
"peut réduire les rétractions pour les modèles complexes et économiser du "
-"temps d’impression, mais ralentit le tranchage et la génération du G-code."
+"temps d’impression, mais ralentit la découpe et la génération du G-code."
msgid "Enable"
msgstr "Activer"
@@ -11245,7 +11289,7 @@ msgstr ""
"Le chemin du G-code est généré après avoir simplifié le contour du modèle "
"pour éviter trop de points et de lignes G-code dans le fichier G-code. Une "
"valeur plus petite signifie une résolution plus élevée et plus de temps pour "
-"trancher"
+"découper"
msgid "Travel distance threshold"
msgstr "Seuil de distance parcourue"
@@ -11263,7 +11307,7 @@ msgstr "Quantité de rétraction avant essuyage"
msgid ""
"The length of fast retraction before wipe, relative to retraction length"
msgstr ""
-"La longueur de la rétraction rapide avant le balayage, par rapport à la "
+"La longueur de la rétraction rapide avant l’essuyage, par rapport à la "
"longueur de la rétraction"
msgid "Retract when change layer"
@@ -11449,7 +11493,7 @@ msgstr ""
"fonction de leur profondeur, formant un motif en zigzag."
msgid "Seam gap"
-msgstr "Distance de la couture"
+msgstr "Écart de couture"
msgid ""
"In order to reduce the visibility of the seam in a closed loop extrusion, "
@@ -11487,7 +11531,7 @@ msgstr ""
"quitte la boucle."
msgid "Wipe before external loop"
-msgstr ""
+msgstr "Essuyer avant la boucle externe"
msgid ""
"To minimise visibility of potential overextrusion at the start of an "
@@ -11500,6 +11544,17 @@ msgid ""
"print order as in these modes it is more likely an external perimeter is "
"printed immediately after a deretraction move."
msgstr ""
+"Pour minimiser la visibilité d’une éventuelle surextrusion au début d’un "
+"périmètre extérieur lors de l’impression avec l’ordre d’impression de paroi "
+"extérieure/intérieure ou intérieure/extérieure/intérieure, la dérétraction "
+"est effectuée légèrement sur l’intérieur à partir du début du périmètre "
+"extérieur. De cette manière, toute sur-extrusion potentielle est cachée de "
+"la surface extérieure. \n"
+"\n"
+"Ceci est utile lors de l’impression avec l’ordre d’impression de la paroi "
+"extérieure/intérieure ou intérieure/extérieure/intérieure, car dans ces "
+"modes, il est plus probable qu’un périmètre extérieur soit imprimé "
+"immédiatement après un mouvement de dérétraction."
msgid "Wipe speed"
msgstr "Vitesse d’essuyage"
@@ -11679,7 +11734,7 @@ msgid ""
"print the wipe tower. User is responsible for ensuring there is no collision "
"with the print."
msgstr ""
-"Si cette option est activée, la tour de purge ne sera pas imprimée sur les "
+"Si cette option est activée, la tour d’essuyage ne sera pas imprimée sur les "
"couches sans changement d’outil. Sur les couches avec changement d’outil, "
"l’extrudeur se déplacera vers le bas pour imprimer la tour de purge. "
"L’utilisateur est responsable de s’assurer qu’il n’y a pas de collision avec "
@@ -11696,20 +11751,20 @@ msgstr ""
"sur le bord avant du plateau au début de l’impression."
msgid "Slice gap closing radius"
-msgstr "Rayon de fermeture du trou"
+msgstr "Rayon de fermeture de l’écart des tranches"
msgid ""
"Cracks smaller than 2x gap closing radius are being filled during the "
"triangle mesh slicing. The gap closing operation may reduce the final print "
"resolution, therefore it is advisable to keep the value reasonably low."
msgstr ""
-"Les fissures inférieures à 2 fois le rayon de fermeture de trou sont "
-"comblées lors du découpage à mailles triangulaires. L'opération de fermeture "
-"des espaces peut réduire la résolution finale d'impression. Il est donc "
-"conseillé de maintenir la valeur à un niveau raisonnablement bas."
+"Les fissures plus petites que 2x le rayon de fermeture de l’espace sont "
+"remplies pendant la découpe de la maille triangulaire. L’opération de "
+"fermeture de l’espace peut réduire la résolution finale de l’impression, il "
+"est donc conseillé de maintenir cette valeur à un niveau raisonnablement bas."
msgid "Slicing Mode"
-msgstr "Mode de tranchage"
+msgstr "Mode de découpe"
msgid ""
"Use \"Even-odd\" for 3DLabPrint airplane models. Use \"Close holes\" to "
@@ -11981,9 +12036,9 @@ msgid ""
"when the prime tower is enabled."
msgstr ""
"La couche de support utilise la hauteur de la couche indépendamment de la "
-"couche objet. Cela permet de personnaliser l'espace Z et de gagner du temps "
-"d'impression. Cette option ne sera pas valide lorsque la tour de purge sera "
-"activée."
+"couche objet. Cela permet de personnaliser l’écart de Z et de gagner du "
+"temps d'impression. Cette option ne sera pas valide lorsque la tour de purge "
+"sera activée."
msgid "Threshold angle"
msgstr "Angle de seuil"
@@ -12238,7 +12293,7 @@ msgid "Speed of travel which is faster and without extrusion"
msgstr "Vitesse de déplacement plus rapide et sans extrusion"
msgid "Wipe while retracting"
-msgstr "Nettoyer lors des rétractions"
+msgstr "Essuyer lors des rétractions"
msgid ""
"Move nozzle along the last extrusion path when retracting to clean leaked "
@@ -12249,7 +12304,7 @@ msgstr ""
"taches lors de l'impression d'une nouvelle pièce après le trajet"
msgid "Wipe Distance"
-msgstr "Distance de balayage"
+msgstr "Distance d’essuyage"
msgid ""
"Discribe how long the nozzle will move along the last path when "
@@ -12265,7 +12320,7 @@ msgstr ""
"Décrire la durée pendant laquelle la buse se déplacera le long de la "
"dernière trajectoire lors de la rétraction. \n"
"\n"
-"En fonction de la durée de l’opération de nettoyage, de la vitesse et de la "
+"En fonction de la durée de l’opération d’essuyage, de la vitesse et de la "
"longueur des réglages de rétraction de l’extrudeuse/filament, un mouvement "
"de rétraction peut être nécessaire pour rétracter le filament restant. \n"
"\n"
@@ -12292,8 +12347,8 @@ msgid ""
"The actual flushing volumes is equal to the flush multiplier multiplied by "
"the flushing volumes in the table."
msgstr ""
-"Les volumes de rinçage actuels sont égaux à la valeur du multiplicateur de "
-"rinçage multiplié par les volumes de rinçage dans le tableau."
+"Les volumes de purge actuels sont égaux à la valeur du multiplicateur de "
+"purge multiplié par les volumes de purge dans le tableau."
msgid "Prime volume"
msgstr "Premier volume"
@@ -12432,7 +12487,6 @@ msgstr ""
msgid "Polyhole detection margin"
msgstr "Marge de détection des trous polygones"
-#, fuzzy, c-format, boost-format
msgid ""
"Maximum defection of a point to the estimated radius of the circle.\n"
"As cylinders are often exported as triangles of varying size, points may not "
@@ -12460,7 +12514,7 @@ msgid ""
"following format: \"XxY, XxY, ...\""
msgstr ""
"Tailles des images à stocker dans les fichiers .gcode et .sl1/.sl1s, au "
-"format suivant : \"XxY, XxY, …\""
+"format suivant : \"XxY, XxY, ...\""
msgid "Format of G-code thumbnails"
msgstr "Format des vignettes G-code"
@@ -12481,15 +12535,21 @@ msgid ""
"Wipe tower is only compatible with relative mode. It is recommended on most "
"printers. Default is checked"
msgstr ""
+"L’extrusion relative est recommandée lors de l’utilisation de l’option "
+"« label_objects ». Certains extrudeurs fonctionnent mieux avec cette option "
+"non verrouillée (mode d’extrusion absolu). La tour d’essuyage n’est "
+"compatible qu’avec le mode relatif. Il est recommandé sur la plupart des "
+"imprimantes. L’option par défaut est cochée"
msgid ""
"Classic wall generator produces walls with constant extrusion width and for "
"very thin areas is used gap-fill. Arachne engine produces walls with "
"variable extrusion width"
msgstr ""
-"Le générateur de parois classique produit des parois avec une largeur "
-"d'extrusion constante, les zones très fines seront remplies. Le générateur "
-"Arachne produit des parois avec une largeur d'extrusion variable."
+"Le générateur de paroi classique produit des parois avec une largeur "
+"d’extrusion constante et, pour les zones très fines, il utilise le "
+"remplissage d’espace. Le moteur Arachne produit des parois avec une largeur "
+"d’extrusion variable."
msgid "Classic"
msgstr "Classique"
@@ -12545,8 +12605,8 @@ msgstr ""
"Une forme cunéiforme dont l'angle est supérieur à ce paramètre n'aura pas de "
"transitions et aucune paroi ne sera imprimé au centre pour remplir l'espace "
"restant. En réduisant ce paramètre, vous réduisez le nombre et la longueur "
-"de ces parois centrales, mais vous risquez de laisser des vides ou de "
-"surextruder les parois."
+"de ces parois centrales, mais vous risquez de laisser des espaces vides ou "
+"de surextruder les parois."
msgid "Wall distribution count"
msgstr "Nombre de parois distribuées"
@@ -12724,7 +12784,7 @@ msgid "Optimizing toolpath"
msgstr "Optimisation du parcours d'outil"
msgid "Slicing mesh"
-msgstr "Maillage de tranchage"
+msgstr "Découpe du maillage"
msgid ""
"No layers were detected. You might want to repair your STL file(s) or check "
@@ -13007,9 +13067,9 @@ msgstr ""
"Wiki.\n"
"\n"
"Habituellement, la calibration est inutile. Lorsque vous démarrez une "
-"impression d'une seule couleur/matériau, avec l'option \"Calibration du débit"
-"\" cochée dans le menu de démarrage de l'impression, l'imprimante suivra "
-"l'ancienne méthode de calibration du filament avant l'impression.\n"
+"impression d'une seule couleur/matériau, avec l'option \"Calibration du "
+"débit\" cochée dans le menu de démarrage de l'impression, l'imprimante "
+"suivra l'ancienne méthode de calibration du filament avant l'impression.\n"
"Lorsque vous démarrez une impression multi-couleurs/matériaux, l'imprimante "
"utilise le paramètre de compensation par défaut pour le filament lors de "
"chaque changement de filament, ce qui donne un bon résultat dans la plupart "
@@ -13045,8 +13105,8 @@ msgstr ""
"1. Sur-extrusion : Excès de matière sur votre objet imprimé, formant des "
"gouttes ou des boutons, ou si les couches semblent plus épaisses que prévu "
"et non uniformes.\n"
-"2. Sous-extrusion : Couches très fines, une faible force de remplissage ou "
-"des espaces dans la couche supérieure du modèle, même si l'impression est "
+"2. Sous-extrusion : Couches très fines, une faible solidité du remplissage "
+"ou des espaces dans la couche supérieure du modèle, même si l'impression est "
"lente\n"
"3. Mauvaise qualité de surface : Si la surface de vos impressions semble "
"rugueuse ou inégale.\n"
@@ -13058,7 +13118,7 @@ msgid ""
"PLA used in RC planes. These materials expand greatly when heated, and "
"calibration provides a useful reference flow rate."
msgstr ""
-"De plus, la calibration du débit est crucial pour les matériaux dotés de la "
+"De plus, la calibration du débit est cruciale pour les matériaux dotés de la "
"technologie de mousse active comme le LW-PLA utilisés dans les avions RC. "
"Ces matériaux se dilatent considérablement lorsqu'ils sont chauffés et la "
"calibration fournit un débit de référence utile."
@@ -13790,8 +13850,8 @@ msgstr ""
"Voulez-vous le réécrire ?"
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 ""
"Nous renommerions les préréglages en « Fournisseur Type Série @imprimante "
@@ -14462,6 +14522,9 @@ msgid ""
"G-code window\n"
"You can turn on/off the G-code window by pressing the C key."
msgstr ""
+"Fenêtre de G-code\n"
+"Vous pouvez activer/désactiver la fenêtre G-code en appuyant sur la touche "
+"C."
#: resources/data/hints.ini: [hint:Switch workspaces]
msgid ""
@@ -14469,6 +14532,9 @@ msgid ""
"You can switch between Prepare and Preview workspaces by "
"pressing the Tab key."
msgstr ""
+"Changer les espaces de travail\n"
+"Vous pouvez alterner entre l’espace de travail Préparer et Aperçu"
+"b> en appuyant sur la touche Tab."
#: resources/data/hints.ini: [hint:How to use keyboard shortcuts]
msgid ""
@@ -14486,6 +14552,10 @@ msgid ""
"Did you know that Reverse on odd feature can significantly improve "
"the surface quality of your overhangs?"
msgstr ""
+"Parois inversées sur couches impaires\n"
+"Saviez-vous que la fonction Parois inversées sur couches impaires "
+"peut améliorer de manière significative la qualité de la surface de vos "
+"surplombs ?"
#: resources/data/hints.ini: [hint:Cut Tool]
msgid ""
@@ -14542,10 +14612,10 @@ msgid ""
"sits on the print bed? Select the \"Place on face\" function or press the "
"F key."
msgstr ""
-"Positionner sur une face\n"
+"Poser sur une face\n"
"Saviez-vous qu'il est possible d'orienter rapidement un modèle de manière à "
"ce que l'une de ses faces repose sur le plateau d'impression ? Sélectionnez "
-"la fonction « Positionner sur une face » ou appuyez sur la touche F."
+"la fonction « Placer sur la face » ou appuyez sur la touche F."
#: resources/data/hints.ini: [hint:Object List]
msgid ""
@@ -14584,7 +14654,7 @@ msgid ""
"Did you know that you can view all objects/parts on a table and change "
"settings for each object/part?"
msgstr ""
-"Tableau des paramètres de tranchage\n"
+"Tableau des paramètres de découpe\n"
"Saviez-vous que vous pouvez afficher tous les objets/pièces sur un tableau "
"et modifier les paramètres de chaque objet/pièce ?"
@@ -14728,15 +14798,15 @@ msgid ""
"one time?"
msgstr ""
"Définir les paramètres de plusieurs objets\n"
-"Saviez-vous que vous pouvez définir des paramètres de tranchage pour tous "
-"les objets sélectionnés en une seule fois ?"
+"Saviez-vous que vous pouvez définir des paramètres de découpe pour tous les "
+"objets sélectionnés en une seule fois ?"
#: resources/data/hints.ini: [hint:Stack objects]
msgid ""
"Stack objects\n"
"Did you know that you can stack objects as a whole one?"
msgstr ""
-"Empilez des objets\n"
+"Empiler des objets\n"
"Saviez-vous que vous pouvez empiler des objets pour n'en former qu'un?"
#: resources/data/hints.ini: [hint:Flush into support/objects/infill]
@@ -14745,9 +14815,9 @@ msgid ""
"Did you know that you can save the wasted filament by flushing them into "
"support/objects/infill during filament change?"
msgstr ""
-"Rincer dans support/objets/remplissage\n"
-"Saviez-vous que vous pouvez réduire le filament gaspillé en le rinçant dans "
-"le support/les objets/le remplissage lors des changements de filament ?"
+"Purger dans les supports/les objets/le remplissage\n"
+"Saviez-vous que vous pouvez réduire le filament gaspillé en le purgeant dans "
+"les supports/les objets/le remplissage lors des changements de filament ?"
#: resources/data/hints.ini: [hint:Improve strength]
msgid ""
@@ -14755,7 +14825,7 @@ msgid ""
"Did you know that you can use more wall loops and higher sparse infill "
"density to improve the strength of the model?"
msgstr ""
-"Améliorer la résistance\n"
+"Améliorer la solidité\n"
"Saviez-vous que vous pouvez définir un plus grand nombre de périmètre et une "
"densité de remplissage plus élevée pour améliorer la résistance du modèle ?"
diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po
index 3f6b58bf29..9a3b43f6e4 100644
--- a/localization/i18n/ko/OrcaSlicer_ko.po
+++ b/localization/i18n/ko/OrcaSlicer_ko.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Orca Slicer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-29 22:55+0800\n"
-"PO-Revision-Date: 2023-12-25 12:35+0900\n"
+"PO-Revision-Date: 2024-01-01 14:28+0900\n"
"Last-Translator: Hotsolidinfill <138652683+Hotsolidinfill@users.noreply."
"github.com>, crwusiz \n"
"Language-Team: \n"
@@ -274,16 +274,16 @@ msgid "uniform scale"
msgstr "균일 배율"
msgid "Planar"
-msgstr ""
+msgstr "평면"
msgid "Dovetail"
-msgstr ""
+msgstr "도브테이"
msgid "Auto"
msgstr "자동"
msgid "Manual"
-msgstr ""
+msgstr "수동"
msgid "Plug"
msgstr "플러그"
@@ -292,10 +292,10 @@ msgid "Dowel"
msgstr "맞춤핀"
msgid "Snap"
-msgstr ""
+msgstr "스냅"
msgid "Prism"
-msgstr ""
+msgstr "프리즘"
msgid "Frustum"
msgstr "원뿔"
@@ -307,13 +307,13 @@ msgid "Hexagon"
msgstr "육각형"
msgid "Keep orientation"
-msgstr ""
+msgstr "방향 유지"
msgid "Place on cut"
msgstr "자른 위치에 놓기"
msgid "Flip upside down"
-msgstr ""
+msgstr "거꾸로 뒤집기"
msgid "Connectors"
msgstr "커넥터"
@@ -331,19 +331,19 @@ msgstr "형태"
#. Size in emboss direction
#. TRN - Input label. Be short as possible
msgid "Depth"
-msgstr ""
+msgstr "깊이"
msgid "Groove"
-msgstr ""
+msgstr "그루브"
msgid "Width"
msgstr "너비"
msgid "Flap Angle"
-msgstr ""
+msgstr "플랩 각도"
msgid "Groove Angle"
-msgstr ""
+msgstr "홈 각도"
msgid "Part"
msgstr "부품"
@@ -355,21 +355,26 @@ msgid ""
"Click to flip the cut plane\n"
"Drag to move the cut plane"
msgstr ""
+"클릭하여 잘라낸 면을 뒤집습니다\n"
+"드래그하여 잘라낸 면을 이동합니다"
msgid ""
"Click to flip the cut plane\n"
"Drag to move the cut plane\n"
"Right-click a part to assign it to the other side"
msgstr ""
+"클릭하여 잘라낸 면을 뒤집습니다\n"
+"드래그하여 절단 면을 이동합니다\n"
+"파트를 마우스 오른쪽 버튼으로 클릭하여 다른 쪽에 할당합니다"
msgid "Move cut plane"
-msgstr ""
+msgstr "절단면 이동"
msgid "Mode"
-msgstr ""
+msgstr "모드"
msgid "Change cut mode"
-msgstr ""
+msgstr "자르기 모드 변경"
msgid "Tolerance"
msgstr "공차"
@@ -378,7 +383,7 @@ msgid "Drag"
msgstr "드래그"
msgid "Draw cut line"
-msgstr ""
+msgstr "절단선 그리기"
msgid "Left click"
msgstr "좌 클릭"
@@ -408,22 +413,22 @@ msgid "Cut"
msgstr "잘라내기"
msgid "Rotate cut plane"
-msgstr ""
+msgstr "절단면 회전"
msgid "Remove connectors"
msgstr "커넥터 제거"
msgid "Bulge"
-msgstr ""
+msgstr "부풀림"
msgid "Bulge proportion related to radius"
-msgstr ""
+msgstr "반경과 관련된 부품림 비율"
msgid "Space"
msgstr "스페이스"
msgid "Space proportion related to radius"
-msgstr ""
+msgstr "반경과 관련된 공간 비율"
msgid "Confirm connectors"
msgstr "커넥터 승인"
@@ -432,26 +437,26 @@ msgid "Cancel"
msgstr "취소"
msgid "Build Volume"
-msgstr ""
+msgstr "빌드 볼륨"
msgid "Flip cut plane"
-msgstr ""
+msgstr "플립 컷 평면"
msgid "Groove change"
-msgstr ""
+msgstr "그루브 변경"
msgid "Reset"
msgstr "초기화"
#. TRN: This is an entry in the Undo/Redo stack. The whole line will be 'Edited: (name of whatever was edited)'.
msgid "Edited"
-msgstr ""
+msgstr "수정됨"
msgid "Cut position"
-msgstr ""
+msgstr "자르기 위치"
msgid "Reset cutting plane"
-msgstr ""
+msgstr "절단면 재설정"
msgid "Edit connectors"
msgstr "커넥터 편집"
@@ -460,10 +465,10 @@ msgid "Add connectors"
msgstr "커넥터 추가"
msgid "Reset cut"
-msgstr ""
+msgstr "컷 재설정"
msgid "Reset cutting plane and remove connectors"
-msgstr ""
+msgstr "절단면 재설정 및 커넥터 제거"
msgid "Upper part"
msgstr "상부 부품"
@@ -495,30 +500,30 @@ msgstr "잘못된 커넥터가 감지됨"
#, c-format, boost-format
msgid "%1$d connector is out of cut contour"
msgid_plural "%1$d connectors are out of cut contour"
-msgstr[0] ""
+msgstr[0] "%1$d 커넥터가 절단 윤곽에서 벗어남"
#, c-format, boost-format
msgid "%1$d connector is out of object"
msgid_plural "%1$d connectors are out of object"
-msgstr[0] ""
+msgstr[0] "%1$d 커넥터가 물체에서 벗어남"
msgid "Some connectors are overlapped"
msgstr "일부 커넥터가 겹칩니다"
msgid "Select at least one object to keep after cutting."
-msgstr ""
+msgstr "잘라낸 후 보관할 개체를 하나 이상 선택합니다."
msgid "Cut plane is placed out of object"
-msgstr ""
+msgstr "절단면이 개체 밖으로 배치됨"
msgid "Cut plane with groove is invalid"
-msgstr ""
+msgstr "홈이 있는 절단면은 유효하지 않습니다"
msgid "Connector"
msgstr "커넥터"
msgid "Cut by Plane"
-msgstr ""
+msgstr "평면으로 자르기"
msgid "non-manifold edges be caused by cut tool, do you want to fix it now?"
msgstr ""
@@ -528,10 +533,10 @@ msgid "Repairing model object"
msgstr "모델 개체 수리 중"
msgid "Cut by line"
-msgstr ""
+msgstr "라인별로 자르기"
msgid "Delete connector"
-msgstr ""
+msgstr "커넥터 삭제"
msgid "Mesh name"
msgstr "메쉬 이름"
@@ -667,46 +672,46 @@ msgid "Text shape"
msgstr "텍스트 모양"
msgid "Set Mirror"
-msgstr ""
+msgstr "반전 설정"
msgid "Embossed text"
-msgstr ""
+msgstr "텍스트 양각"
msgid "Enter emboss gizmo"
-msgstr ""
+msgstr "양각 기즈모 입력"
msgid "Leave emboss gizmo"
-msgstr ""
+msgstr "양각 기즈모 남기기"
msgid "Embossing actions"
-msgstr ""
+msgstr "양각 작업"
msgid "Emboss"
-msgstr ""
+msgstr "양각"
msgid "Text-Rotate"
-msgstr ""
+msgstr "텍스트 회전"
msgid "NORMAL"
-msgstr ""
+msgstr "NORMAL"
msgid "SMALL"
-msgstr ""
+msgstr "SMALL"
msgid "ITALIC"
-msgstr ""
+msgstr "ITALIC"
msgid "SWISS"
-msgstr ""
+msgstr "SWISS"
msgid "MODERN"
-msgstr ""
+msgstr "MODERN"
msgid "First font"
-msgstr ""
+msgstr "첫 번째 글꼴"
msgid "Default font"
-msgstr ""
+msgstr "기본 글꼴"
msgid "Advanced"
msgstr "고급"
@@ -714,143 +719,144 @@ msgstr "고급"
msgid ""
"The text cannot be written using the selected font. Please try choosing a "
"different font."
-msgstr ""
+msgstr "선택한 글꼴로는 텍스트를 쓸 수 없습니다. 다른 글꼴을 선택해 보세요."
msgid "Embossed text cannot contain only white spaces."
-msgstr ""
+msgstr "양각 텍스트에는 공백만 포함될 수 없습니다."
msgid "Text contains character glyph (represented by '?') unknown by font."
msgstr ""
+"텍스트에 글꼴로 알 수 없는 문자 모양('?'으로 표시)이 포함되어 있습니다."
msgid "Text input doesn't show font skew."
-msgstr ""
+msgstr "텍스트 입력에는 글꼴 기울어짐이 표시되지 않습니다."
msgid "Text input doesn't show font boldness."
-msgstr ""
+msgstr "텍스트 입력에는 글꼴의 굵기가 표시되지 않습니다."
msgid "Text input doesn't show gap between lines."
-msgstr ""
+msgstr "텍스트 입력 시 줄 사이의 간격이 표시되지 않습니다."
msgid "Too tall, diminished font height inside text input."
-msgstr ""
+msgstr "텍스트 입력 내에서 너무 길고 글꼴 높이가 줄어듭니다."
msgid "Too small, enlarged font height inside text input."
-msgstr ""
+msgstr "텍스트 입력 내 글꼴 높이가 너무 작아서 확대되었습니다."
msgid "Text doesn't show current horizontal alignment."
-msgstr ""
+msgstr "텍스트에 현재 가로 정렬이 표시되지 않습니다."
msgid "Revert font changes."
-msgstr ""
+msgstr "글꼴 변경 사항을 되돌립니다."
#, boost-format
msgid "Font \"%1%\" can't be selected."
-msgstr ""
+msgstr "글꼴 \"%1%\"을(를) 선택할 수 없습니다."
msgid "Operation"
-msgstr ""
+msgstr "작업"
msgid "Join"
-msgstr ""
+msgstr "접합부"
msgid "Click to change text into object part."
-msgstr ""
+msgstr "텍스트를 개체 부분으로 변경하려면 클릭하세요."
msgid "You can't change a type of the last solid part of the object."
-msgstr ""
+msgstr "개체의 마지막 솔리드 부분 유형은 변경할 수 없습니다."
msgctxt "EmbossOperation"
msgid "Cut"
-msgstr ""
+msgstr "자르기"
msgid "Click to change part type into negative volume."
-msgstr ""
+msgstr "부품 유형을 음수 볼륨으로 변경하려면 클릭하세요."
msgid "Modifier"
msgstr "수정자"
msgid "Click to change part type into modifier."
-msgstr ""
+msgstr "부품 유형을 수정자로 변경하려면 클릭하세요."
msgid "Change Text Type"
-msgstr ""
+msgstr "텍스트 유형 변경"
#, boost-format
msgid "Rename style(%1%) for embossing text"
-msgstr ""
+msgstr "양각 텍스트의 스타일 이름 바꾸기(%1%)"
msgid "Name can't be empty."
-msgstr ""
+msgstr "이름은 비워둘 수 없습니다."
msgid "Name has to be unique."
-msgstr ""
+msgstr "이름은 고유해야 합니다."
msgid "OK"
msgstr "확인"
msgid "Rename style"
-msgstr ""
+msgstr "스타일 이름 바꾸기"
msgid "Rename current style."
-msgstr ""
+msgstr "현재 스타일의 이름을 바꿉니다."
msgid "Can't rename temporary style."
-msgstr ""
+msgstr "임시 스타일의 이름을 바꿀 수 없습니다."
msgid "First Add style to list."
-msgstr ""
+msgstr "먼저 목록에 스타일을 추가합니다."
#, boost-format
msgid "Save %1% style"
-msgstr ""
+msgstr "%1% 스타일 저장"
msgid "No changes to save."
-msgstr ""
+msgstr "저장할 변경사항이 없습니다."
msgid "New name of style"
-msgstr ""
+msgstr "스타일의 새 이름"
msgid "Save as new style"
-msgstr ""
+msgstr "새 스타일로 저장"
msgid "Only valid font can be added to style."
-msgstr ""
+msgstr "유효한 글꼴만 스타일에 추가할 수 있습니다."
msgid "Add style to my list."
-msgstr ""
+msgstr "내 목록에 스타일을 추가하세요."
msgid "Save as new style."
-msgstr ""
+msgstr "새 스타일로 저장합니다."
msgid "Remove style"
-msgstr ""
+msgstr "스타일 제거"
msgid "Can't remove the last existing style."
-msgstr ""
+msgstr "마지막 기존 스타일을 제거할 수 없습니다."
#, boost-format
msgid "Are you sure you want to permanently remove the \"%1%\" style?"
-msgstr ""
+msgstr "\"%1%\" 스타일을 영구적으로 제거하시겠습니까?"
#, boost-format
msgid "Delete \"%1%\" style."
-msgstr ""
+msgstr "\"%1%\" 스타일을 삭제합니다."
#, boost-format
msgid "Can't delete \"%1%\". It is last style."
-msgstr ""
+msgstr "\"%1%\"을(를) 삭제할 수 없습니다. 마지막 스타일입니다."
#, boost-format
msgid "Can't delete temporary style \"%1%\"."
-msgstr ""
+msgstr "임시 스타일 \"%1%\"을(를) 삭제할 수 없습니다."
#, boost-format
msgid "Modified style \"%1%\""
-msgstr ""
+msgstr "수정된 스타일 \"%1%\""
#, boost-format
msgid "Current style is \"%1%\""
-msgstr ""
+msgstr "현재 스타일은 \"%1%\"입니다."
#, boost-format
msgid ""
@@ -858,145 +864,152 @@ msgid ""
"\n"
"Would you like to continue anyway?"
msgstr ""
+"스타일을 \"%1%\"(으)로 변경하면 현재 스타일 수정 사항이 삭제됩니다.\n"
+"\n"
+"그래도 계속하시겠습니까?"
msgid "Not valid style."
-msgstr ""
+msgstr "유효한 스타일이 아닙니다."
#, boost-format
msgid "Style \"%1%\" can't be used and will be removed from a list."
-msgstr ""
+msgstr "스타일 \"%1%\"은(는) 사용할 수 없으며 목록에서 제거됩니다."
msgid "Unset italic"
-msgstr ""
+msgstr "이탤릭체 설정해제"
msgid "Set italic"
-msgstr ""
+msgstr "이탤릭체 설정"
msgid "Unset bold"
-msgstr ""
+msgstr "굵게 설정해제"
msgid "Set bold"
-msgstr ""
+msgstr "굵게 설정"
msgid "Revert text size."
-msgstr ""
+msgstr "텍스트 크기를 되돌립니다."
msgid "Revert embossed depth."
-msgstr ""
+msgstr "양각 깊이를 되돌립니다."
msgid ""
"Advanced options cannot be changed for the selected font.\n"
"Select another font."
msgstr ""
+"선택한 글꼴에 대해서는 고급 옵션을 변경할 수 없습니다.\n"
+"다른 글꼴을 선택하세요."
msgid "Revert using of model surface."
-msgstr ""
+msgstr "모델 표면 사용을 되돌립니다."
msgid "Revert Transformation per glyph."
-msgstr ""
+msgstr "문자 모양 변환을 되돌립니다."
msgid "Set global orientation for whole text."
-msgstr ""
+msgstr "전체 텍스트에 대한 전역 방향을 설정합니다."
msgid "Set position and orientation per glyph."
-msgstr ""
+msgstr "문자 모양별로 위치와 방향을 설정합니다."
msgctxt "Alignment"
msgid "Left"
-msgstr ""
+msgstr "왼쪽"
msgctxt "Alignment"
msgid "Center"
-msgstr ""
+msgstr "중앙"
msgctxt "Alignment"
msgid "Right"
-msgstr ""
+msgstr "오른쪽"
msgctxt "Alignment"
msgid "Top"
-msgstr ""
+msgstr "위"
msgctxt "Alignment"
msgid "Middle"
-msgstr ""
+msgstr "가운데"
msgctxt "Alignment"
msgid "Bottom"
-msgstr ""
+msgstr "아래"
msgid "Revert alignment."
-msgstr ""
+msgstr "정렬을 되돌립니다."
#. TRN EmbossGizmo: font units
msgid "points"
-msgstr ""
+msgstr "위치"
msgid "Revert gap between characters"
-msgstr ""
+msgstr "문자 사이의 간격 되돌리기"
msgid "Distance between characters"
-msgstr ""
+msgstr "문자 사이의 거리"
msgid "Revert gap between lines"
-msgstr ""
+msgstr "선 사이의 간격 되돌리기"
msgid "Distance between lines"
-msgstr ""
+msgstr "선 사이의 거리"
msgid "Undo boldness"
-msgstr ""
+msgstr "두드러짐 취소"
msgid "Tiny / Wide glyphs"
-msgstr ""
+msgstr "작은/넓은 문자 모양"
msgid "Undo letter's skew"
-msgstr ""
+msgstr "문자 기울어짐 실행 취소"
msgid "Italic strength ratio"
-msgstr ""
+msgstr "이텔릭체 강도 비율"
msgid "Undo translation"
-msgstr ""
+msgstr "번역 취소"
msgid "Distance of the center of the text to the model surface."
-msgstr ""
+msgstr "텍스트 중심에서 모델 표면까지의 거리입니다."
msgid "Undo rotation"
-msgstr ""
+msgstr "회전 실행 취소"
msgid "Rotate text Clock-wise."
-msgstr ""
+msgstr "텍스트를 시계 방향으로 회전합니다."
msgid "Unlock the text's rotation when moving text along the object's surface."
-msgstr ""
+msgstr "개체 표면을 따라 텍스트를 이동할 때 텍스트 회전을 잠금 해제합니다."
msgid "Lock the text's rotation when moving text along the object's surface."
-msgstr ""
+msgstr "개체 표면을 따라 텍스트를 이동할 때 텍스트 회전을 잠급니다."
msgid "Select from True Type Collection."
-msgstr ""
+msgstr "트루타입 컬렉션에서 선택하세요."
msgid "Set text to face camera"
-msgstr ""
+msgstr "카메라를 향하도록 텍스트 설정"
msgid "Orient the text towards the camera."
-msgstr ""
+msgstr "텍스트 방향을 카메라 쪽으로 향하게 합니다."
#, boost-format
msgid ""
"Can't load exactly same font(\"%1%\"). Aplication selected a similar "
"one(\"%2%\"). You have to specify font for enable edit text."
msgstr ""
+"정확히 동일한 글꼴(\"%1%\")을 로드할 수 없습니다. 응용 프로그램이 유사한 항목"
+"(\"%2%\")을 선택했습니다. 텍스트 편집을 활성화하려면 글꼴을 지정해야 합니다."
msgid "No symbol"
-msgstr ""
+msgstr "기호 없음"
msgid "Loading"
msgstr "로드 중"
msgid "In queue"
-msgstr ""
+msgstr "대기열에 있음"
#. TRN - Input label. Be short as possible
#. Height of one text line - Font Ascent
@@ -1007,35 +1020,35 @@ msgstr "높이"
#. Copy surface of model on surface of the embossed text
#. TRN - Input label. Be short as possible
msgid "Use surface"
-msgstr ""
+msgstr "표면 사용"
#. TRN - Input label. Be short as possible
#. Option to change projection on curved surface
#. for each character(glyph) in text separately
msgid "Per glyph"
-msgstr ""
+msgstr "문자모양 당"
#. TRN - Input label. Be short as possible
#. Align Top|Middle|Bottom and Left|Center|Right
msgid "Alignment"
-msgstr ""
+msgstr "조정"
#. TRN - Input label. Be short as possible
msgid "Char gap"
-msgstr ""
+msgstr "문자 간격"
#. TRN - Input label. Be short as possible
msgid "Line gap"
-msgstr ""
+msgstr "줄 간격"
#. TRN - Input label. Be short as possible
msgid "Boldness"
-msgstr ""
+msgstr "두드러짐"
#. TRN - Input label. Be short as possible
#. Like Font italic
msgid "Skew ratio"
-msgstr ""
+msgstr "기울어짐 비율"
#. TRN - Input label. Be short as possible
#. Distance from model surface to be able
@@ -1043,250 +1056,253 @@ msgstr ""
#. move text as modifier fully out of not flat surface
#. TRN - Input label. Be short as possible
msgid "From surface"
-msgstr ""
+msgstr "표면에서"
#. TRN - Input label. Be short as possible
#. Keep vector from bottom to top of text aligned with printer Y axis
msgid "Keep up"
-msgstr ""
+msgstr "유지하다"
#. TRN - Input label. Be short as possible.
#. Some Font file contain multiple fonts inside and
#. this is numerical selector of font inside font collections
msgid "Collection"
-msgstr ""
+msgstr "수집"
msgid "Enter SVG gizmo"
-msgstr ""
+msgstr "SVG 기즈모 입력"
msgid "Leave SVG gizmo"
-msgstr ""
+msgstr "SVG 기즈모 나가기"
msgid "SVG actions"
-msgstr ""
+msgstr "SVG 작업"
msgid "SVG"
msgstr "SVG"
#. TRN This is an item label in the undo-redo stack.
msgid "SVG-Rotate"
-msgstr ""
+msgstr "SVG-회전"
#, boost-format
msgid "Opacity (%1%)"
-msgstr ""
+msgstr "불투명도(%1%)"
#, boost-format
msgid "Color gradient (%1%)"
-msgstr ""
+msgstr "색상 그라데이션(%1%)"
msgid "Undefined fill type"
-msgstr ""
+msgstr "정의되지 않은 채우기 유형"
msgid "Linear gradient"
-msgstr ""
+msgstr "선형 그래디언트"
msgid "Radial gradient"
-msgstr ""
+msgstr "방사형 그래디언트"
msgid "Open filled path"
-msgstr ""
+msgstr "채워진 경로 열기"
msgid "Undefined stroke type"
-msgstr ""
+msgstr "정의되지 않은 스트로크 유형"
msgid "Path can't be healed from selfintersection and multiple points."
-msgstr ""
+msgstr "자체 교차 및 여러 지점에서는 경로를 복구할 수 없습니다."
msgid ""
"Final shape constains selfintersection or multiple points with same "
"coordinate."
msgstr ""
+"최종 모양에는 자체 교차점이나 동일한 좌표를 가진 여러 점이 포함되어 있습니다."
#, boost-format
msgid "Shape is marked as invisible (%1%)."
-msgstr ""
+msgstr "모양이 보이지 않음(%1%)으로 표시되었습니다."
#. TRN: The first placeholder is shape identifier, the second one is text describing the problem.
#, boost-format
msgid "Fill of shape (%1%) contains unsupported: %2%."
-msgstr ""
+msgstr "도형 채우기(%1%)에는 지원되지 않는 %2%가 포함되어 있습니다."
#, boost-format
msgid "Stroke of shape (%1%) is too thin (minimal width is %2% mm)."
-msgstr ""
+msgstr "모양의 획(%1%)이 너무 얇습니다(최소 너비는 %2%mm)."
#, boost-format
msgid "Stroke of shape (%1%) contains unsupported: %2%."
-msgstr ""
+msgstr "모양의 획(%1%)에는 지원되지 않는 %2%가 포함되어 있습니다."
msgid "Face the camera"
-msgstr ""
+msgstr "카메라를 바라보세요"
#. TRN - Preview of filename after clear local filepath.
msgid "Unknown filename"
-msgstr ""
+msgstr "알 수 없는 파일 이름"
#, boost-format
msgid "SVG file path is \"%1%\""
-msgstr ""
+msgstr "SVG 파일 경로는 \"%1%\"입니다."
msgid "Reload SVG file from disk."
-msgstr ""
+msgstr "디스크에서 SVG 파일을 다시 로드합니다."
msgid "Change file"
-msgstr ""
+msgstr "파일 변경"
msgid "Change to another .svg file"
-msgstr ""
+msgstr "다른 .svg 파일로 변경"
msgid "Forget the file path"
-msgstr ""
+msgstr "파일 경로 기억하지않음"
msgid ""
"Do NOT save local path to 3MF file.\n"
"Also disables 'reload from disk' option."
msgstr ""
+"3MF 파일에 로컬 경로를 저장하지 마십시오.\n"
+"또한 '디스크에서 다시 로드' 옵션을 비활성화합니다."
#. TRN: An menu option to convert the SVG into an unmodifiable model part.
msgid "Bake"
-msgstr ""
+msgstr "굽기"
#. TRN: Tooltip for the menu item.
msgid "Bake into model as uneditable part"
-msgstr ""
+msgstr "편집할 수 없는 부분으로 모델에 굽기"
msgid "Save as"
-msgstr ""
+msgstr "다른 이름으로 저장"
msgid "Save SVG file"
-msgstr ""
+msgstr "SVG 파일 저장"
msgid "Save as '.svg' file"
-msgstr ""
+msgstr "'.svg' 파일로 저장"
msgid "Size in emboss direction."
-msgstr ""
+msgstr "양각 방향의 크기입니다."
#. TRN: The placeholder contains a number.
#, boost-format
msgid "Scale also changes amount of curve samples (%1%)"
-msgstr ""
+msgstr "규모도 곡선 샘플의 양을 변경합니다(%1%)."
msgid "Width of SVG."
-msgstr ""
+msgstr "SVG의 너비."
msgid "Height of SVG."
-msgstr ""
+msgstr "SVG의 높이."
msgid "Lock/unlock the aspect ratio of the SVG."
-msgstr ""
+msgstr "SVG의 종횡비를 잠금/잠금 해제합니다."
msgid "Reset scale"
-msgstr ""
+msgstr "규모 재설정"
msgid "Resize"
-msgstr ""
+msgstr "크기 조정"
msgid "Distance of the center of the SVG to the model surface."
-msgstr ""
+msgstr "SVG 중심에서 모델 표면까지의 거리입니다."
msgid "Reset distance"
-msgstr ""
+msgstr "거리 재설정"
msgid "Reset rotation"
-msgstr ""
+msgstr "회전 재설정"
msgid "Lock/unlock rotation angle when dragging above the surface."
-msgstr ""
+msgstr "표면 위로 드래그할 때 회전 각도를 잠금/잠금 해제합니다."
msgid "Mirror vertically"
-msgstr ""
+msgstr "수직으로 반전"
msgid "Mirror horizontally"
-msgstr ""
+msgstr "수평으로 반전"
#. TRN: This is the name of the action that shows in undo/redo stack (changing part type from SVG to something else).
msgid "Change SVG Type"
-msgstr ""
+msgstr "SVG 유형 변경"
#. TRN - Input label. Be short as possible
msgid "Mirror"
msgstr "반전"
msgid "Choose SVG file for emboss:"
-msgstr ""
+msgstr "양각을 위한 SVG 파일 선택:"
#, boost-format
msgid "File does NOT exist (%1%)."
-msgstr ""
+msgstr "파일이 존재하지 않습니다(%1%)."
#, boost-format
msgid "Filename has to end with \".svg\" but you selected %1%"
-msgstr ""
+msgstr "파일 이름은 \".svg\"로 끝나야 하지만 %1%을(를) 선택했습니다"
#, boost-format
msgid "Nano SVG parser can't load from file (%1%)."
-msgstr ""
+msgstr "나노 SVG 파서는 파일(%1%)에서 로드할 수 없습니다."
#, boost-format
msgid "SVG file does NOT contain a single path to be embossed (%1%)."
-msgstr ""
+msgstr "SVG 파일에는 양각할 단일 경로(%1%)가 포함되어 있지 않습니다."
msgid "Vertex"
-msgstr ""
+msgstr "꼭지점"
msgid "Edge"
-msgstr ""
+msgstr "가장자리"
msgid "Plane"
-msgstr ""
+msgstr "평면"
msgid "Point on edge"
-msgstr ""
+msgstr "가장자리의 점"
msgid "Point on circle"
-msgstr ""
+msgstr "원 위의 점"
msgid "Point on plane"
-msgstr ""
+msgstr "평면 위의 점"
msgid "Center of edge"
-msgstr ""
+msgstr "가장자리 중심"
msgid "Center of circle"
-msgstr ""
+msgstr "원의 중심"
msgid "ShiftLeft mouse button"
-msgstr ""
+msgstr "Shift + 왼쪽 마우스 버튼"
msgid "Select feature"
-msgstr ""
+msgstr "기능 선택"
msgid "Select point"
-msgstr ""
+msgstr "위치 선택"
msgid "Delete"
msgstr "삭제"
msgid "Restart selection"
-msgstr ""
+msgstr "다시 선택"
msgid "Esc"
msgstr "Esc"
msgid "Unselect"
-msgstr ""
+msgstr "선택 취소"
msgid "Measure"
-msgstr ""
+msgstr "측정"
msgid "Edit to scale"
-msgstr ""
+msgstr "규모에 맞게 편집"
msgctxt "Verb"
msgid "Scale"
-msgstr ""
+msgstr "규모"
msgid "None"
msgstr "없음"
@@ -1298,22 +1314,22 @@ msgid "Length"
msgstr "길이"
msgid "Selection"
-msgstr ""
+msgstr "선택"
msgid "Copy to clipboard"
msgstr "클립보드로 복사"
msgid "Perpendicular distance"
-msgstr ""
+msgstr "수직 거리"
msgid "Distance"
-msgstr ""
+msgstr "거리"
msgid "Direct distance"
-msgstr ""
+msgstr "직접적인 거리"
msgid "Distance XYZ"
-msgstr ""
+msgstr "XYZ 거리"
msgid "Ctrl+"
msgstr "Ctrl+"
@@ -5883,7 +5899,7 @@ msgid "Stealth Mode"
msgstr "스텔스 모드"
msgid "Check for stable updates only"
-msgstr ""
+msgstr "안정적인 업데이트만 확인"
msgid "Metric"
msgstr "미터법"
@@ -6752,6 +6768,8 @@ msgid ""
"Layer height is too small.\n"
"It will set to min_layer_height\n"
msgstr ""
+"레이어 높이가 너무 작습니다.\n"
+"min_layer_height로 설정됩니다.\n"
msgid ""
"Layer height exceeds the limit in Printer Settings -> Extruder -> Layer "
@@ -6772,8 +6790,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"
@@ -8771,7 +8789,6 @@ msgstr "반전 임계값"
msgid "Overhang reversal threshold"
msgstr "돌출부 반전 임계값"
-#, fuzzy, c-format, boost-format
msgid ""
"Number of mm the overhang need to be for the reversal to be considered "
"useful. Can be a % of the perimeter width.\n"
@@ -9551,7 +9568,6 @@ msgstr "선의 시작 또는 주 방향을 제어하는 드문 채우기 패턴
msgid "Sparse infill density"
msgstr "드문 채우기 밀도"
-#, fuzzy, c-format, boost-format
msgid ""
"Density of internal sparse infill, 100% turns all sparse infill into solid "
"infill and internal solid infill pattern will be used"
@@ -9786,10 +9802,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 ""
"팬 속도는 \"close_fan_the_first_x_layers\" 의 0에서 \"full_fan_speed_layer\" "
"의 최고 속도까지 선형적으로 증가합니다. \"full_fan_speed_layer\"가 "
@@ -10923,7 +10939,7 @@ msgstr ""
"에 안쪽으로의 작은 이동이 실행됩니다."
msgid "Wipe before external loop"
-msgstr ""
+msgstr "외부 루프 전 닦아내기"
msgid ""
"To minimise visibility of potential overextrusion at the start of an "
@@ -10936,6 +10952,13 @@ msgid ""
"print order as in these modes it is more likely an external perimeter is "
"printed immediately after a deretraction move."
msgstr ""
+"외부/내부 또는 내부/외부/내부 벽 인쇄 순서로 인쇄할 때 외부 둘레 시작 부분에"
+"서 잠재적인 과잉 압출의 가시성을 최소화하기 위해 외부 둘레 시작 부분에서 내부"
+"에 후퇴가 약간 수행됩니다. 이렇게 하면 압출에 대한 모든 잠재력이 외부 표면에"
+"서 숨겨집니다.\n"
+"\n"
+"외부/내부 또는 내부/외부/내부 벽 인쇄 순서로 인쇄할 때 유용합니다. 이러한 모"
+"드에서는 후퇴 이동 직후 외부 둘레가 인쇄될 가능성이 더 높기 때문입니다."
msgid "Wipe speed"
msgstr "닦기 속도"
@@ -11845,6 +11868,10 @@ msgid ""
"Wipe tower is only compatible with relative mode. It is recommended on most "
"printers. Default is checked"
msgstr ""
+"\"label_objects\" 옵션을 사용할 때는 상대 압출을 권장합니다. 일부 압출기는 "
+"이 옵션을 선택하지 않은 경우(절대 압출 모드) 더 잘 작동합니다. 와이프 타워는 "
+"상대 모드와만 호환됩니다. 대부분의 프린터에 권장됩니다. 기본값이 선택되어 있"
+"습니다"
msgid ""
"Classic wall generator produces walls with constant extrusion width and for "
@@ -13076,8 +13103,8 @@ 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 ""
"사전 설정의 이름을 \"선택한 공급업체 유형 직렬 @프린터\"로 변경합니다.\n"
@@ -13707,6 +13734,8 @@ msgid ""
"G-code window\n"
"You can turn on/off the G-code window by pressing the C key."
msgstr ""
+"G코드 창\n"
+"C 키를 눌러 G코드 창을 켜거나 끌 수 있습니다."
#: resources/data/hints.ini: [hint:Switch workspaces]
msgid ""
@@ -13714,6 +13743,9 @@ msgid ""
"You can switch between Prepare and Preview workspaces by "
"pressing the Tab key."
msgstr ""
+"작업 공간 전환\n"
+"Tab 키를 눌러 준비 작업 공간과 미리 보기 작업 공간 사이"
+"를 전환할 수 있습니다."
#: resources/data/hints.ini: [hint:How to use keyboard shortcuts]
msgid ""
@@ -13730,6 +13762,9 @@ msgid ""
"Did you know that Reverse on odd feature can significantly improve "
"the surface quality of your overhangs?"
msgstr ""
+"홀수에 반전\n"
+"홀수면 반전 기능이 오버행의 표면 품질을 크게 향상시킬 수 있다는 사실"
+"을 알고 계셨습니까?"
#: resources/data/hints.ini: [hint:Cut Tool]
msgid ""
diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po
index 1b371cc0c5..8715f26784 100644
--- a/localization/i18n/tr/OrcaSlicer_tr.po
+++ b/localization/i18n/tr/OrcaSlicer_tr.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OrcaSlicer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-12-29 22:55+0800\n"
-"PO-Revision-Date: 2023-12-29 22:35+0300\n"
+"PO-Revision-Date: 2024-01-01 00:01+0300\n"
"Last-Translator: Olcay ÖREN\n"
"Language-Team: Türkçe\n"
"Language: tr_TR\n"
@@ -884,13 +884,13 @@ msgid "Unset italic"
msgstr "Yatık ayarı kaldır"
msgid "Set italic"
-msgstr "Yatık olarak ayarla"
+msgstr "Yatık"
msgid "Unset bold"
msgstr "Kalın ayarı kaldır"
msgid "Set bold"
-msgstr "Kalın olarak ayarla"
+msgstr "Kalın"
msgid "Revert text size."
msgstr "Metin boyutunu geri döndür."
@@ -946,7 +946,7 @@ msgstr "Hizalamayı geri al."
#. TRN EmbossGizmo: font units
msgid "points"
-msgstr "noktalar"
+msgstr "punto"
msgid "Revert gap between characters"
msgstr "Karakterler arasındaki boşluğu geri döndür"
@@ -994,7 +994,7 @@ msgid "Select from True Type Collection."
msgstr "True Type Koleksiyonundan seçim yapın."
msgid "Set text to face camera"
-msgstr "Metni yüz kamerasına ayarla"
+msgstr "Metni bana çevir"
msgid "Orient the text towards the camera."
msgstr "Metni kameraya doğru yönlendirin."
@@ -1048,7 +1048,7 @@ msgstr "Satır boşluğu"
#. TRN - Input label. Be short as possible
msgid "Boldness"
-msgstr "Boldness"
+msgstr "Kalınlık"
#. TRN - Input label. Be short as possible
#. Like Font italic
@@ -1269,7 +1269,7 @@ msgid "Center of circle"
msgstr "Çemberin merkezi"
msgid "ShiftLeft mouse button"
-msgstr "Shift Sol fare düğmesi"
+msgstr "Shift + Sol fare düğmesi"
msgid "Select feature"
msgstr "Özellik seçin"
@@ -1278,10 +1278,10 @@ msgid "Select point"
msgstr "Nokta seç"
msgid "Delete"
-msgstr "Sil"
+msgstr "Delete"
msgid "Restart selection"
-msgstr "Seçimi yeniden başlat"
+msgstr "Seçimi sıfırla"
msgid "Esc"
msgstr "Esc"
@@ -13831,7 +13831,7 @@ msgid "For more information, please check out Wiki"
msgstr "Daha fazla bilgi için lütfen Wiki'ye göz atın"
msgid "Collapse"
-msgstr "Çökme"
+msgstr "Daralt"
msgid "Daily Tips"
msgstr "Günlük İpuçları"
diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po
index 98174279eb..ba52f6f31b 100644
--- a/localization/i18n/uk/OrcaSlicer_uk.po
+++ b/localization/i18n/uk/OrcaSlicer_uk.po
@@ -23,16 +23,16 @@ msgid "Supports Painting"
msgstr "Малювання підтримки"
msgid "Alt + Mouse wheel"
-msgstr "Alt + Коліщатко миші"
+msgstr "Alt + коліщатко миші"
msgid "Section view"
msgstr "Вигляд у розрізі"
msgid "Reset direction"
-msgstr "Напрямок скидання"
+msgstr "Скинути напрямок"
msgid "Ctrl + Mouse wheel"
-msgstr "Ctrl + Коліщатко миші"
+msgstr "Ctrl + коліщатко миші"
msgid "Pen size"
msgstr "Розмір пера"
@@ -53,7 +53,7 @@ msgid "Shift + Left mouse button"
msgstr "Shift + Ліва кнопка миші"
msgid "Erase"
-msgstr "Ластик"
+msgstr "Гумка"
msgid "Erase all painting"
msgstr "Стерти всі малюнки"
@@ -74,13 +74,13 @@ msgid "Tool type"
msgstr "Тип інструменту"
msgid "Smart fill angle"
-msgstr "Розумний кут заливки"
+msgstr "Розумний кут заповнення"
msgid "On overhangs only"
-msgstr "Тільки на звисах"
+msgstr "Тільки на виступах"
msgid "Auto support threshold angle: "
-msgstr "Кут порога автоматичної підтримки: "
+msgstr "Пороговий кут автоматичної підтримки: "
msgid "Circle"
msgstr "Коло"
@@ -118,8 +118,8 @@ msgid ""
"Filament count exceeds the maximum number that painting tool supports. only "
"the first %1% filaments will be available in painting tool."
msgstr ""
-"Кількість філаменту перевищує максимальну кількість, яка підтримуєінструмент "
-"для фарбування. тільки перші %1% ниток будуть доступні у засобі забарвлення."
+"Кількість філаменту перевищує максимальну кількість, яку підтримує інструмент "
+"малювання. Лише перші %1% філаменту будуть доступні в інструменті малювання."
msgid "Color Painting"
msgstr "Кольорове малювання"
@@ -149,34 +149,34 @@ msgid "Brush"
msgstr "Пензель"
msgid "Smart fill"
-msgstr "Інтелектуальне заливання"
+msgstr "Інтелектуальне заповнення"
msgid "Bucket fill"
-msgstr "Заливка відра"
+msgstr "Заповнення відром"
msgid "Height range"
msgstr "Діапазон висот"
msgid "Alt + Shift + Enter"
-msgstr ""
+msgstr "Alt + Shift + Enter"
msgid "Toggle Wireframe"
msgstr "Переключення каркасу"
msgid "Shortcut Key "
-msgstr "Поєднання клавіш "
+msgstr "Комбінація клавіш "
msgid "Triangle"
msgstr "Трикутник"
msgid "Height Range"
-msgstr "Переключити каркас"
+msgstr "Діапазон висот"
msgid "Vertical"
-msgstr ""
+msgstr "Вертикальний"
msgid "Horizontal"
-msgstr ""
+msgstr "Горизонтальний"
msgid "Remove painted color"
msgstr "Видалити зафарбований колір"
@@ -201,7 +201,7 @@ msgid "Optimize orientation"
msgstr "Оптимізувати орієнтацію"
msgid "Apply"
-msgstr "Готово"
+msgstr "Застосувати"
msgid "Scale"
msgstr "Масштаб"
@@ -475,7 +475,7 @@ msgid "Keep"
msgstr "Тримати"
msgid "Flip"
-msgstr "Переверніть"
+msgstr "Перевернути"
msgid "After cut"
msgstr "Після вирізування"
@@ -790,7 +790,7 @@ msgid "OK"
msgstr "ОК"
msgid "Rename style"
-msgstr ""
+msgstr "Перейменувати стиль"
msgid "Rename current style."
msgstr ""
@@ -818,13 +818,13 @@ msgid "Only valid font can be added to style."
msgstr ""
msgid "Add style to my list."
-msgstr ""
+msgstr "Додати стиль до мого списку."
msgid "Save as new style."
-msgstr ""
+msgstr "Зберегти як новий стиль."
msgid "Remove style"
-msgstr ""
+msgstr "Видалити стиль"
msgid "Can't remove the last existing style."
msgstr ""
@@ -1241,7 +1241,7 @@ msgid "Edge"
msgstr ""
msgid "Plane"
-msgstr ""
+msgstr "Площина"
msgid "Point on edge"
msgstr ""
@@ -1809,13 +1809,13 @@ msgid "Mirror object"
msgstr "Дзеркальний об'єкт"
msgid "Edit text"
-msgstr ""
+msgstr "Редагувати текст"
msgid "Ability to change text, font, size, ..."
msgstr ""
msgid "Edit SVG"
-msgstr ""
+msgstr "Редагувати SVG"
msgid "Change SVG source file, projection, size, ..."
msgstr ""
@@ -2995,7 +2995,7 @@ msgid ""
"The AMS will automatically read the filament information when inserting a "
"new Bambu Lab filament. This takes about 20 seconds."
msgstr ""
-"AMS автоматично зчитує інформацію про філаментає при вставці новогоФіламент "
+"AMS автоматично зчитає інформацію про філамент при вставці нового філаменту "
"Bambu Lab. Це займає близько 20 секунд."
msgid ""
@@ -3003,17 +3003,17 @@ msgid ""
"automatically read any information until printing is completed."
msgstr ""
"Примітка: якщо під час друку буде вставлено новий філамент, AMS не "
-"будеавтоматично читати будь-яку інформацію до завершення друку."
+"буде автоматично читати будь-яку інформацію до завершення друку."
msgid ""
"When inserting a new filament, the AMS will not automatically read its "
"information, leaving it blank for you to enter manually."
msgstr ""
-"При вставці нової нитки AMS не автоматично зчитуватиме її\n"
-"інформацію, залишивши поле порожнім для введення вручну."
+"При вставці новогр філаменту, AMS не ьуде автоматично зчитувати \n"
+"інформацію про нього, залишивши поле порожнім для введення вручну."
msgid "Power on update"
-msgstr "Оновлення під час увімкнення"
+msgstr "Оновлення після ввімкнення"
msgid ""
"The AMS will automatically read the information of inserted filament on "
@@ -3028,9 +3028,9 @@ msgid ""
"during startup and will continue to use the information recorded before the "
"last shutdown."
msgstr ""
-"AMS не буде автоматично зчитувати інформацію з вставленої нитки.\n"
+"AMS не буде автоматично зчитувати інформацію про вставлений філамент\n"
"під час запуску і продовжуватиме використовувати інформацію, записану до\n"
-"останнє вимкнення."
+"останнтого вимкнення."
msgid "Update remaining capacity"
msgstr "Оновити ємність, що залишилася"
@@ -3683,7 +3683,7 @@ msgid "Total"
msgstr "Загальний"
msgid "Tower"
-msgstr ""
+msgstr "Вежа"
msgid "Total Estimation"
msgstr "Загальна оцінка"
@@ -3692,7 +3692,7 @@ msgid "Total time"
msgstr "Загальний час"
msgid "Total cost"
-msgstr ""
+msgstr "Загальна вартість"
msgid "up to"
msgstr "аж до"
@@ -4067,7 +4067,7 @@ msgid "Application is closing"
msgstr "Додаток закривається"
msgid "Closing Application while some presets are modified."
-msgstr "Закриття програми при зміні деяких пресетів."
+msgstr "Закриття програми під чвс зміни деяких налаштувань."
msgid "Logging"
msgstr "Ведення журналу"
@@ -4082,7 +4082,7 @@ msgid "Device"
msgstr "Пристрій"
msgid "Project"
-msgstr "Проект"
+msgstr "Проєкт"
msgid "Yes"
msgstr "Так"
@@ -4091,7 +4091,7 @@ msgid "No"
msgstr "Ні"
msgid "will be closed before creating a new model. Do you want to continue?"
-msgstr "буде закрито перед створенням нової моделі. Ви хочете продовжувати?"
+msgstr "буде закрито перед створенням нової моделі. Ви хочете продовжити?"
msgid "Slice plate"
msgstr "Нарізати моделі"
@@ -4929,7 +4929,7 @@ msgid "Rate the Print Profile"
msgstr ""
msgid "Comment"
-msgstr ""
+msgstr "Коментувати"
msgid "Rate this print"
msgstr ""
@@ -5213,10 +5213,10 @@ msgstr "Верх"
msgctxt "Layers"
msgid "Bottom"
-msgstr "Ніз"
+msgstr "Низ"
msgid "Enable AI monitoring of printing"
-msgstr "Увімкнути ІІ-моніторинг друку"
+msgstr "Увімкнути ШІ-моніторинг друку"
msgid "Sensitivity of pausing is"
msgstr "Чутливість паузи"
@@ -5228,7 +5228,7 @@ msgid ""
"The localization tag of build plate is detected, and printing is paused if "
"the tag is not in predefined range."
msgstr ""
-"Виявлено тег локалізації робочої пластини, і друк припиняється,якщо\n"
+"Виявлено тег локалізації робочої пластини, і друк припиняється, якщо\n"
"тег не знаходиться в певному діапазоні."
msgid "First Layer Inspection"
@@ -5771,21 +5771,21 @@ msgid ""
msgstr ""
msgid "Private protection"
-msgstr ""
+msgstr "Приватний захист"
msgid "Is the printer ready? Is the print sheet in place, empty and clean?"
msgstr ""
msgid "Upload and Print"
-msgstr ""
+msgstr "Завантажити і друкувати"
msgid ""
"Print By Object: \n"
"Suggest to use auto-arrange to avoid collisions when printing."
msgstr ""
-"Друк об'єктом: \n"
-"Запропонуйте використовувати автоматичне розташування, щоб уникнути "
-"колізійпід час друку."
+"Друк за об'єктом: \n"
+"Рекомендовано використовувати автоматичне розташування, щоб уникнути "
+"колізій під час друку."
msgid "Send G-code"
msgstr "Надіслати G-код"
@@ -6468,7 +6468,7 @@ msgid ""
"printer firmware to support AMS slot assignment."
msgstr ""
"Філамент %s не відповідає філаменту в слоті AMS %s. Будь ласка, оновіть "
-"Прошивка принтера для підтримки призначення слотів AMS."
+"прошивку принтера для підтримки перепризначення слотів AMS."
msgid ""
"Filament does not match the filament in AMS slot. Please update the printer "
@@ -6481,13 +6481,13 @@ msgid ""
"The printer firmware only supports sequential mapping of filament => AMS "
"slot."
msgstr ""
-"Прошивка принтера підтримує лише послідовне зіставленняфіламенту => AMS слот."
+"Прошивка принтера підтримує лише послідовне зіставлення філаменту => AMS слот."
msgid "An SD card needs to be inserted before printing."
-msgstr "Перед печаткою необхідно вставити картку SD."
+msgstr "Перед початком друку необхідно вставити картку SD."
msgid "The selected printer is incompatible with the chosen printer presets."
-msgstr ""
+msgstr "Вибраний принтер несумісний зі встановленими налаштуваннями."
msgid "An SD card needs to be inserted to record timelapse."
msgstr "SD-карта повинна бути вставлена для запису таймлапсу."
@@ -6644,7 +6644,7 @@ msgid "Would you like to log in this printer with current account?"
msgstr "Ви хочете увійти до цього принтера з поточним обліковим записом?"
msgid "Check the reason"
-msgstr ""
+msgstr "Перевірте причину"
msgid "Read and accept"
msgstr ""
@@ -6893,7 +6893,7 @@ msgid "Post-processing Scripts"
msgstr "Сценарії постобробки"
msgid "Notes"
-msgstr ""
+msgstr "Примітки"
msgid "Frequent"
msgstr "Частий"
@@ -7039,10 +7039,10 @@ msgid "Complete print"
msgstr ""
msgid "Filament start G-code"
-msgstr "G-код початку Філаменту"
+msgstr "G-код початку філаменту"
msgid "Filament end G-code"
-msgstr "G-код кінця Філаменту"
+msgstr "G-код кінця філаменту"
msgid "Multimaterial"
msgstr ""
@@ -10571,7 +10571,7 @@ msgstr ""
"конфігурації шляхом читання змінних середовища."
msgid "Printer notes"
-msgstr ""
+msgstr "Нотатки для принтера"
msgid "You can put your notes regarding the printer here."
msgstr ""
@@ -14097,7 +14097,7 @@ msgstr ""
#~ "Material becomes soft at this temperature. Thus the heatbed cannot be "
#~ "hotter than this tempature"
#~ msgstr ""
-#~ "При цій температурі матеріал стає м'яким. Таким чином, нагріваєтьсяшар не "
+#~ "При цій температурі матеріал стає м'яким. Таким чином, нагрівається шар не "
#~ "може бути гарячішим, ніж ця температура"
#~ msgid "Enable this option if machine has auxiliary part cooling fan"
diff --git a/resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json b/resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json
index 0b259149d0..ffa6bc5a37 100644
--- a/resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json
+++ b/resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json
@@ -8,7 +8,7 @@
"compatible_printers": [
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.8 nozzle",
- "Bambu Lab P1S 0.6 nozzle",
+ "Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1E 0.8 nozzle"
]
-}
\ No newline at end of file
+}
diff --git a/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png b/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png
index f998ef0a0f..7f46811450 100644
Binary files a/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png and b/resources/profiles/Creality/Creality Ender-3 V3 KE_cover.png differ
diff --git a/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png b/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png
index 27bb29a209..f0645f9e2d 100644
Binary files a/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png and b/resources/profiles/Creality/Creality Ender-3 V3 SE_cover.png differ
diff --git a/resources/profiles/Creality/Creality Ender-5 S1_cover.png b/resources/profiles/Creality/Creality Ender-5 S1_cover.png
index f273e875f6..4113ce44bb 100644
Binary files a/resources/profiles/Creality/Creality Ender-5 S1_cover.png and b/resources/profiles/Creality/Creality Ender-5 S1_cover.png differ
diff --git a/resources/profiles/Creality/Creality K1 Max_cover.png b/resources/profiles/Creality/Creality K1 Max_cover.png
index 9f2ff8dc2d..51bc19b000 100644
Binary files a/resources/profiles/Creality/Creality K1 Max_cover.png and b/resources/profiles/Creality/Creality K1 Max_cover.png differ
diff --git a/resources/profiles/Creality/Creality K1_cover.png b/resources/profiles/Creality/Creality K1_cover.png
index b2295e7b94..6feb2d239a 100644
Binary files a/resources/profiles/Creality/Creality K1_cover.png and b/resources/profiles/Creality/Creality K1_cover.png differ
diff --git a/resources/profiles/Creality/Ender-3 V3 KE_cover.png b/resources/profiles/Creality/Ender-3 V3 KE_cover.png
deleted file mode 100644
index f998ef0a0f..0000000000
Binary files a/resources/profiles/Creality/Ender-3 V3 KE_cover.png and /dev/null differ
diff --git a/resources/profiles/Creality/creality_ender3v3ke_buildplate_model.stl b/resources/profiles/Creality/creality_ender3v3ke_buildplate_model.stl
index a3837d2b59..ef159f264b 100644
Binary files a/resources/profiles/Creality/creality_ender3v3ke_buildplate_model.stl and b/resources/profiles/Creality/creality_ender3v3ke_buildplate_model.stl differ
diff --git a/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.png
index 60f628fe6d..f9d61c63ca 100644
Binary files a/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.png and b/resources/profiles/Creality/creality_ender3v3ke_buildplate_texture.png differ
diff --git a/resources/profiles/Creality/creality_ender3v3se_buildplate_model.stl b/resources/profiles/Creality/creality_ender3v3se_buildplate_model.stl
index a3837d2b59..ef159f264b 100644
Binary files a/resources/profiles/Creality/creality_ender3v3se_buildplate_model.stl and b/resources/profiles/Creality/creality_ender3v3se_buildplate_model.stl differ
diff --git a/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.png
index 60f628fe6d..f9d61c63ca 100644
Binary files a/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.png and b/resources/profiles/Creality/creality_ender3v3se_buildplate_texture.png differ
diff --git a/resources/profiles/Creality/creality_ender5s1_buildplate_model.stl b/resources/profiles/Creality/creality_ender5s1_buildplate_model.stl
index 1e5aaba863..ef159f264b 100644
Binary files a/resources/profiles/Creality/creality_ender5s1_buildplate_model.stl and b/resources/profiles/Creality/creality_ender5s1_buildplate_model.stl differ
diff --git a/resources/profiles/Creality/creality_ender5s1_buildplate_texture.png b/resources/profiles/Creality/creality_ender5s1_buildplate_texture.png
index f122fca0c7..f9d61c63ca 100644
Binary files a/resources/profiles/Creality/creality_ender5s1_buildplate_texture.png and b/resources/profiles/Creality/creality_ender5s1_buildplate_texture.png differ
diff --git a/resources/profiles/Creality/creality_k1_buildplate_model.stl b/resources/profiles/Creality/creality_k1_buildplate_model.stl
index 1e5aaba863..ef159f264b 100644
Binary files a/resources/profiles/Creality/creality_k1_buildplate_model.stl and b/resources/profiles/Creality/creality_k1_buildplate_model.stl differ
diff --git a/resources/profiles/Creality/creality_k1_buildplate_texture.png b/resources/profiles/Creality/creality_k1_buildplate_texture.png
index 0bbf7e3bd6..f9d61c63ca 100644
Binary files a/resources/profiles/Creality/creality_k1_buildplate_texture.png and b/resources/profiles/Creality/creality_k1_buildplate_texture.png differ
diff --git a/resources/profiles/Creality/creality_k1max_buildplate_model.stl b/resources/profiles/Creality/creality_k1max_buildplate_model.stl
index 400d74ba33..c742406e33 100644
Binary files a/resources/profiles/Creality/creality_k1max_buildplate_model.stl and b/resources/profiles/Creality/creality_k1max_buildplate_model.stl differ
diff --git a/resources/profiles/Creality/creality_k1max_buildplate_texture.png b/resources/profiles/Creality/creality_k1max_buildplate_texture.png
index 93e69c0355..4564b19750 100644
Binary files a/resources/profiles/Creality/creality_k1max_buildplate_texture.png and b/resources/profiles/Creality/creality_k1max_buildplate_texture.png differ
diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json
index 46b1a94c2b..f2ccd3c796 100644
--- a/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json
+++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 KE 0.4 nozzle.json
@@ -106,16 +106,21 @@
"deretraction_speed": [
"40"
],
- "z_hop": [
- "0.1"
- ],
+ "z_hop": [
+ "0.1"
+ ],
"single_extruder_multi_material": "1",
+ "manual_filament_change": "1",
"change_filament_gcode": "PAUSE",
- "machine_pause_gcode": "M25",
+ "machine_pause_gcode": "PAUSE",
"default_filament_profile": [
"Creality Generic PLA @Ender-3V3-all"
],
"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \n \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.0 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize \nG1 X-2.0 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-1.7 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-1.7 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z5 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X2 Y218 F3000 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
\ No newline at end of file
diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json
index c27d1185e8..928aa5d055 100644
--- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json
+++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.4 nozzle.json
@@ -107,6 +107,7 @@
"30"
],
"single_extruder_multi_material": "1",
+ "manual_filament_change": "1",
"change_filament_gcode": "M600",
"machine_pause_gcode": "M25",
"default_filament_profile": [
@@ -114,5 +115,9 @@
],
"machine_start_gcode": "M220 S100 ;Reset Feedrate \nM221 S100 ;Reset Flowrate \n \nM140 S[bed_temperature_initial_layer_single] ;Set final bed temp \nG28 ;Home \n \nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nM104 S[nozzle_temperature_initial_layer] ;Set final nozzle temp \nG1 X-2.1 Y20 Z0.28 F5000.0 ;Move to start position \nM190 S[bed_temperature_initial_layer_single] ;Wait for bed temp to stabilize \nM109 S[nozzle_temperature_initial_layer] ;Wait for nozzle temp to stabilize \nG1 X-2.1 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line \nG1 X-2.4 Y145.0 Z0.28 F5000.0 ;Move to side a little \nG1 X-2.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line \nG92 E0 ;Reset Extruder \nG1 E-1.0000 F1800 ;Retract a bit \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 E0.0000 F1800",
"machine_end_gcode": "G91 ;Relative positionning \nG1 E-2 F2700 ;Retract a bit \nG1 E-2 Z0.2 F2400 ;Retract and raise Z \nG1 X5 Y5 F3000 ;Wipe out \nG1 Z10 ;Raise Z more \nG90 ;Absolute positionning \n \nG1 X0 Y0 ;Present print \nM106 S0 ;Turn-off fan \nM104 S0 ;Turn-off hotend \nM140 S0 ;Turn-off bed \n \nM84 X Y E ;Disable all steppers but Z",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
\ No newline at end of file
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json
index 7d7318e06e..08e8a647a6 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json
+++ b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json
@@ -36,13 +36,22 @@
"retract_before_wipe": ["70%"],
"retraction_length": ["0.5"],
"retract_length_toolchange": ["1"],
+ "retraction_speed": ["40"],
"deretraction_speed": ["40"],
- "z_hop": ["0.4"],
+ "extruder_clearance_height_to_lid": "101",
+ "extruder_clearance_height_to_rod": "45",
+ "extruder_clearance_radius": "45",
+ "z_hop": ["0.2"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "manual_filament_change": "1",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"],
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
"machine_end_gcode": "END_PRINT",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json
index 4dc6040ff1..b14a7c1290 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json
+++ b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json
@@ -38,12 +38,20 @@
"retract_length_toolchange": ["1"],
"retraction_speed": ["40"],
"deretraction_speed": ["40"],
- "z_hop": ["0.4"],
+ "extruder_clearance_height_to_lid": "101",
+ "extruder_clearance_height_to_rod": "45",
+ "extruder_clearance_radius": "45",
+ "z_hop": ["0.2"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "manual_filament_change": "1",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"],
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
"machine_end_gcode": "END_PRINT",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json
index c38bec2896..754d89ef21 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json
+++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json
@@ -36,13 +36,22 @@
"retract_before_wipe": ["70%"],
"retraction_length": ["0.5"],
"retract_length_toolchange": ["1"],
+ "retraction_speed": ["40"],
"deretraction_speed": ["40"],
- "z_hop": ["0.4"],
+ "extruder_clearance_height_to_lid": "101",
+ "extruder_clearance_height_to_rod": "45",
+ "extruder_clearance_radius": "45",
+ "z_hop": ["0.2"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "manual_filament_change": "1",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"],
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
"machine_end_gcode": "END_PRINT",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json
index 3653176f06..e999f3f96c 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json
@@ -37,13 +37,22 @@
"retract_before_wipe": ["70%"],
"retraction_length": ["0.5"],
"retract_length_toolchange": ["1"],
+ "retraction_speed": ["40"],
"deretraction_speed": ["40"],
- "z_hop": ["0.4"],
+ "extruder_clearance_height_to_lid": "101",
+ "extruder_clearance_height_to_rod": "45",
+ "extruder_clearance_radius": "45",
+ "z_hop": ["0.2"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "manual_filament_change": "1",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"],
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
"machine_end_gcode": "END_PRINT",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json
index e5d88cba7e..79aa6f90d4 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json
@@ -37,13 +37,22 @@
"retract_before_wipe": ["70%"],
"retraction_length": ["0.5"],
"retract_length_toolchange": ["1"],
+ "retraction_speed": ["40"],
"deretraction_speed": ["40"],
- "z_hop": ["0.4"],
+ "extruder_clearance_height_to_lid": "101",
+ "extruder_clearance_height_to_rod": "45",
+ "extruder_clearance_radius": "45",
+ "z_hop": ["0.2"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "manual_filament_change": "1",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"],
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
"machine_end_gcode": "END_PRINT",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json
index 38daeeb4a1..aa439ff6e1 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json
@@ -37,13 +37,22 @@
"retract_before_wipe": ["70%"],
"retraction_length": ["0.5"],
"retract_length_toolchange": ["1"],
+ "retraction_speed": ["40"],
"deretraction_speed": ["40"],
- "z_hop": ["0.4"],
+ "extruder_clearance_height_to_lid": "101",
+ "extruder_clearance_height_to_rod": "45",
+ "extruder_clearance_radius": "45",
+ "z_hop": ["0.2"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "manual_filament_change": "1",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"],
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
"machine_end_gcode": "END_PRINT",
- "scan_first_layer": "0"
+ "scan_first_layer": "0",
+ "thumbnails": [
+ "96x96",
+ "300x300"
+ ]
}
diff --git a/resources/profiles/Creality/machine/fdm_machine_common.json b/resources/profiles/Creality/machine/fdm_machine_common.json
index 6bf00c7418..f24b0ac313 100644
--- a/resources/profiles/Creality/machine/fdm_machine_common.json
+++ b/resources/profiles/Creality/machine/fdm_machine_common.json
@@ -113,6 +113,8 @@
"1"
],
"z_hop_types": "Normal Lift",
+ "support_air_filtration": "0",
+ "support_chamber_temp_control": "0",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"default_print_profile": "0.16mm Optimal @Bambu Lab X1 Carbon 0.4 nozzle",
"machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3SE.json b/resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3SE.json
index b25d7c6103..1aaf17848a 100644
--- a/resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3SE.json
+++ b/resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3SE.json
@@ -14,7 +14,7 @@
"bottom_shell_thickness": "0",
"bridge_flow": "0.95",
"bridge_speed": "100",
- "brim_type": "no_brim",
+ "brim_type": "no_brim",
"brim_width": "0",
"brim_object_gap": "0.1",
"compatible_printers_condition": "",
@@ -79,7 +79,7 @@
"support_interface_spacing": "0.5",
"support_interface_speed": "100%",
"support_interface_pattern": "auto",
- "support_base_pattern": "default",
+ "support_base_pattern": "rectilinear",
"support_base_pattern_spacing": "2.5",
"support_speed": "50",
"support_threshold_angle": "25",
diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3SE.json b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3SE.json
index ea79adc6a6..06f8a0ca98 100644
--- a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3SE.json
+++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3SE.json
@@ -14,7 +14,7 @@
"bottom_shell_thickness": "0",
"bridge_flow": "0.95",
"bridge_speed": "100",
- "brim_type": "no_brim",
+ "brim_type": "no_brim",
"brim_width": "0",
"brim_object_gap": "0.1",
"compatible_printers_condition": "",
@@ -79,7 +79,7 @@
"support_interface_spacing": "0.5",
"support_interface_speed": "100%",
"support_interface_pattern": "auto",
- "support_base_pattern": "default",
+ "support_base_pattern": "rectilinear",
"support_base_pattern_spacing": "2.5",
"support_speed": "50",
"support_threshold_angle": "25",
diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3SE.json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3SE.json
index 258e85ce14..d4c6979f51 100644
--- a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3SE.json
+++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3SE.json
@@ -14,7 +14,7 @@
"bottom_shell_thickness": "0",
"bridge_flow": "0.95",
"bridge_speed": "100",
- "brim_type": "no_brim",
+ "brim_type": "no_brim",
"brim_width": "0",
"brim_object_gap": "0.1",
"compatible_printers_condition": "",
@@ -79,7 +79,7 @@
"support_interface_spacing": "0.5",
"support_interface_speed": "100%",
"support_interface_pattern": "auto",
- "support_base_pattern": "default",
+ "support_base_pattern": "rectilinear",
"support_base_pattern_spacing": "2.5",
"support_speed": "50",
"support_threshold_angle": "25",
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json
index 38f45ed36b..ec108f4bbc 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json
@@ -45,7 +45,7 @@
"45"
],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.2 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json
index 67797ba22b..31f286183a 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json
@@ -45,7 +45,7 @@
"45"
],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.4 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json
index 702c41dda2..2571925831 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json
@@ -45,7 +45,7 @@
"45"
],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.6 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json
index f3db22bf19..be0547eff2 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json
@@ -45,7 +45,7 @@
"45"
],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.8 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json
index 166c899a60..fd0f4d3b30 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json
@@ -75,7 +75,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.2 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json
index 7098e11a3a..cf91a968dc 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json
@@ -75,7 +75,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.4 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json
index 6e8d6d7a14..f8c08ef414 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json
@@ -75,7 +75,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.6 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json
index c76eff987a..916695f13e 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json
@@ -75,7 +75,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.8 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json
index 60cf66c0b3..3895833b46 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json
@@ -81,7 +81,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.2 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json
index 6e087821d8..ba889a48e0 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json
@@ -81,7 +81,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.4 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json
index c5e5fc3f8b..0ba5d6e2c0 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json
@@ -81,7 +81,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.6 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json
index 0d1664faa1..94c9c802a5 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json
@@ -81,7 +81,7 @@
"wipe_distance": ["1"],
"z_hop": ["0.4"],
"z_hop_types": ["Normal Lift"],
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.8 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json
index 7fd23f6f26..eeedf2d80b 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json
@@ -48,7 +48,7 @@
"45"
],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.2 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json
index 39839831a6..a8cd75a7b4 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json
@@ -48,7 +48,7 @@
"45"
],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA @0.4 nozzle"
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json
index c3fcd7f312..1309fa72b4 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json
@@ -25,7 +25,7 @@
"retract_length_toolchange": ["2"],
"deretraction_speed": ["45"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": ["Elegoo Generic PLA @0.6 nozzle"],
"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json
index c1b8d18645..90ca1d242e 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json
@@ -39,7 +39,7 @@
"retract_length_toolchange": ["2"],
"deretraction_speed": ["45"],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": ["Elegoo Generic PLA @0.8 nozzle"],
"machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\n\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json
index 8f108f6865..e1280f65a9 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json
@@ -101,7 +101,7 @@
"40"
],
"single_extruder_multi_material": "1",
- "change_filament_gcode": "",
+ "change_filament_gcode": "PAUSE",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Elegoo Generic PLA"
diff --git a/resources/web/data/text.js b/resources/web/data/text.js
index 87a2969a11..a5dd7375ba 100644
--- a/resources/web/data/text.js
+++ b/resources/web/data/text.js
@@ -439,6 +439,9 @@ var LangText = {
t92: "Cabane de Noël Bambu",
t93: "Connexion à l'imprimante",
t94: "Veuillez configurer la connexion de votre imprimante pour afficher l'interface.",
+ t109: "Filaments du système",
+ t110: "Filaments personnalisés",
+ t111: "Créer un nouveau filament",
wk1: "Démarrage rapide",
wk2: "Cet article présente l'utilisation la plus basique de Orca Slicer. Il guide les utilisateurs pour configurer le logiciel, créer des projets et effectuer la première tâche d'impression étape par étape.",
wk3: "Workflow basé sur des projets",
@@ -454,7 +457,7 @@ var LangText = {
wk13: "Format STEP",
wk14: "Par rapport au format STL, le format STEP apporte des informations plus efficaces. Grâce à la grande précision de ce format, de nombreuses trajectoires d'extrusion peuvent être générées sous forme d'arcs. Il inclut également la relation d'assemblage de chaque pièce d'un modèle, qui peut être utilisée pour restaurer la vue d'assemblage après la coupe d'un modèle.",
wk15: "Texte 3D",
- wk16: "Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. Orca Slicer fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité.",
+ wk16: "Avec l'outil Texte 3D, les utilisateurs peuvent facilement créer diverses formes de texte 3D dans le projet, ce qui rend le modèle plus personnalisé. Orca Slicer fournit des dizaines de polices et prend en charge les styles gras et italique pour donner au texte une plus grande flexibilité."
},
zh_CN: {
t1: "欢迎使用Orca Slicer",
diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
index 16b5ee67c2..ff9b4854ef 100644
--- a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
+++ b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp
@@ -44,6 +44,8 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
if (junctions.size() <= min_path_size)
return;
+ // TODO: allow for the first point to be removed in case of simplifying closed Extrusionlines.
+
/* ExtrusionLines are treated as (open) polylines, so in case an ExtrusionLine is actually a closed polygon, its
* starting and ending points will be equal (or almost equal). Therefore, the simplification of the ExtrusionLine
* should not touch the first and last points. As a result, start simplifying from point at index 1.
@@ -52,16 +54,12 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
// Starting junction should always exist in the simplified path
new_junctions.emplace_back(junctions.front());
- ExtrusionJunction previous = junctions.front();
- /* For open ExtrusionLines the last junction cannot be taken into consideration when checking the points at index 1.
- * For closed ExtrusionLines, the first and last junctions are the same, so use the prior to last juction.
+ /* Initially, previous_previous is always the same as previous because, for open ExtrusionLines the last junction
+ * cannot be taken into consideration when checking the points at index 1. For closed ExtrusionLines, the first and
+ * last junctions are anyway the same.
* */
- ExtrusionJunction previous_previous = this->is_closed ? junctions[junctions.size() - 2] : junctions.front();
-
- /* TODO: When deleting, combining, or modifying junctions, it would
- * probably be good to set the new junction's width to a weighted average
- * of the junctions it is derived from.
- */
+ ExtrusionJunction previous_previous = junctions.front();
+ ExtrusionJunction previous = junctions.front();
/* When removing a vertex, we check the height of the triangle of the area
being removed from the original polygon by the simplification. However,
@@ -78,20 +76,16 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
From this area we compute the height of the representative triangle using
the standard formula for a triangle area: A = .5*b*h
*/
- const ExtrusionJunction& initial = junctions[1];
+ const ExtrusionJunction& initial = junctions.at(1);
int64_t accumulated_area_removed = int64_t(previous.p.x()) * int64_t(initial.p.y()) - int64_t(previous.p.y()) * int64_t(initial.p.x()); // Twice the Shoelace formula for area of polygon per line segment.
- // For a closed polygon we process the last point, which is the same as the first point.
- for (size_t point_idx = 1; point_idx < junctions.size() - (this->is_closed ? 0 : 1); point_idx++)
+ for (size_t point_idx = 1; point_idx < junctions.size() - 1; point_idx++)
{
- // For the last point of a closed polygon, use the first point of the new polygon in case we modified it.
- const bool is_last = point_idx + 1 == junctions.size();
- const ExtrusionJunction& current = is_last ? new_junctions[0] : junctions[point_idx];
+ const ExtrusionJunction& current = junctions[point_idx];
// Spill over in case of overflow, unless the [next] vertex will then be equal to [previous].
- const bool spill_over = this->is_closed && point_idx + 2 >= junctions.size() &&
- point_idx + 2 - junctions.size() < new_junctions.size();
- ExtrusionJunction& next = spill_over ? new_junctions[point_idx + 2 - junctions.size()] : junctions[point_idx + 1];
+ const bool spill_over = point_idx + 1 == junctions.size() && new_junctions.size() > 1;
+ ExtrusionJunction& next = spill_over ? new_junctions[0] : junctions[point_idx + 1];
const int64_t removed_area_next = int64_t(current.p.x()) * int64_t(next.p.y()) - int64_t(current.p.y()) * int64_t(next.p.x()); // Twice the Shoelace formula for area of polygon per line segment.
const int64_t negative_area_closing = int64_t(next.p.x()) * int64_t(previous.p.y()) - int64_t(next.p.y()) * int64_t(previous.p.x()); // Area between the origin and the short-cutting segment
@@ -139,18 +133,12 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
// We should instead move this point to a location where both edges are kept and then remove the previous point that we wanted to keep.
// By taking the intersection of these two lines, we get a point that preserves the direction (so it makes the corner a bit more pointy).
// We just need to be sure that the intersection point does not introduce an artifact itself.
- // o < prev_prev
- // |
- // o < prev
- // \ < short segment
- // intersection > + o-------------------o < next
- // ^ current
Point intersection_point;
bool has_intersection = Line(previous_previous.p, previous.p).intersection_infinite(Line(current.p, next.p), &intersection_point);
if (!has_intersection
|| Line::distance_to_infinite_squared(intersection_point, previous.p, current.p) > double(allowed_error_distance_squared)
|| (intersection_point - previous.p).cast().squaredNorm() > smallest_line_segment_squared // The intersection point is way too far from the 'previous'
- || (intersection_point - current.p).cast().squaredNorm() > smallest_line_segment_squared) // and 'current' points, so it shouldn't replace 'current'
+ || (intersection_point - next.p).cast().squaredNorm() > smallest_line_segment_squared) // and 'next' points, so it shouldn't replace 'current'
{
// We can't find a better spot for it, but the size of the line is more than 5 micron.
// So the only thing we can do here is leave it in...
@@ -186,14 +174,15 @@ void ExtrusionLine::simplify(const int64_t smallest_line_segment_squared, const
new_junctions.push_back(current);
}
- if (this->is_closed) {
- /* The first and last points should be the same for a closed polygon.
- * We processed the last point above, so copy it into the first point.
- */
- new_junctions.front().p = new_junctions.back().p;
- } else {
- // Ending junction (vertex) should always exist in the simplified path
- new_junctions.emplace_back(junctions.back());
+ // Ending junction (vertex) should always exist in the simplified path
+ new_junctions.emplace_back(junctions.back());
+
+ /* In case this is a closed polygon (instead of a poly-line-segments), the invariant that the first and last points are the same should be enforced.
+ * Since one of them didn't move, and the other can't have been moved further than the constraints, if originally equal, they can simply be equated.
+ */
+ if ((junctions.front().p - junctions.back().p).cast().squaredNorm() == 0)
+ {
+ new_junctions.back().p = junctions.front().p;
}
junctions = new_junctions;
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index f4b5813571..02d935f6e6 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -85,8 +85,6 @@ set(lisbslic3r_sources
ExtrusionEntity.hpp
ExtrusionEntityCollection.cpp
ExtrusionEntityCollection.hpp
- ExtrusionRole.cpp
- ExtrusionRole.hpp
ExtrusionSimulator.cpp
ExtrusionSimulator.hpp
FileParserError.hpp
diff --git a/src/libslic3r/ExtrusionRole.cpp b/src/libslic3r/ExtrusionRole.cpp
deleted file mode 100644
index 81dcee695b..0000000000
--- a/src/libslic3r/ExtrusionRole.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-///|/ Copyright (c) Prusa Research 2023 Pavel Mikuš @Godrak, Oleksandra Iushchenko @YuSanka, Vojtěch Bubník @bubnikv
-///|/
-///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
-///|/
-#include "ExtrusionRole.hpp"
-#include "I18N.hpp"
-
-#include
-#include
-#include
-
-
-namespace Slic3r {
-
-// Convert a rich bitmask based ExtrusionRole to a less expressive ordinal GCodeExtrusionRole.
-// GCodeExtrusionRole is to be serialized into G-code and deserialized by G-code viewer,
-GCodeExtrusionRole extrusion_role_to_gcode_extrusion_role(ExtrusionRole role)
-{
- if (role == erNone) return GCodeExtrusionRole::None;
- if (role == erOverhangPerimeter) return GCodeExtrusionRole::OverhangPerimeter;
- if (role == erExternalPerimeter) return GCodeExtrusionRole::ExternalPerimeter;
- if (role == erPerimeter) return GCodeExtrusionRole::Perimeter;
- if (role == erInternalInfill) return GCodeExtrusionRole::InternalInfill;
- if (role == erSolidInfill) return GCodeExtrusionRole::SolidInfill;
- if (role == erTopSolidInfill) return GCodeExtrusionRole::TopSolidInfill;
- if (role == erIroning) return GCodeExtrusionRole::Ironing;
- if (role == erBridgeInfill) return GCodeExtrusionRole::BridgeInfill;
- if (role == erGapFill) return GCodeExtrusionRole::GapFill;
- if (role == erSkirt) return GCodeExtrusionRole::Skirt;
- if (role == erSupportMaterial) return GCodeExtrusionRole::SupportMaterial;
- if (role == erSupportMaterialInterface) return GCodeExtrusionRole::SupportMaterialInterface;
- if (role == erWipeTower) return GCodeExtrusionRole::WipeTower;
- assert(false);
- return GCodeExtrusionRole::None;
-}
-
-std::string gcode_extrusion_role_to_string(GCodeExtrusionRole role)
-{
- switch (role) {
- case GCodeExtrusionRole::None : return L("Unknown");
- case GCodeExtrusionRole::Perimeter : return L("Perimeter");
- case GCodeExtrusionRole::ExternalPerimeter : return L("External perimeter");
- case GCodeExtrusionRole::OverhangPerimeter : return L("Overhang perimeter");
- case GCodeExtrusionRole::InternalInfill : return L("Internal infill");
- case GCodeExtrusionRole::SolidInfill : return L("Solid infill");
- case GCodeExtrusionRole::TopSolidInfill : return L("Top solid infill");
- case GCodeExtrusionRole::Ironing : return L("Ironing");
- case GCodeExtrusionRole::BridgeInfill : return L("Bridge infill");
- case GCodeExtrusionRole::GapFill : return L("Gap fill");
- case GCodeExtrusionRole::Skirt : return L("Skirt/Brim");
- case GCodeExtrusionRole::SupportMaterial : return L("Support material");
- case GCodeExtrusionRole::SupportMaterialInterface : return L("Support material interface");
- case GCodeExtrusionRole::WipeTower : return L("Wipe tower");
- case GCodeExtrusionRole::Custom : return L("Custom");
- default : assert(false);
- }
- return {};
-}
-
-GCodeExtrusionRole string_to_gcode_extrusion_role(const std::string_view role)
-{
- if (role == L("Perimeter"))
- return GCodeExtrusionRole::Perimeter;
- else if (role == L("External perimeter"))
- return GCodeExtrusionRole::ExternalPerimeter;
- else if (role == L("Overhang perimeter"))
- return GCodeExtrusionRole::OverhangPerimeter;
- else if (role == L("Internal infill"))
- return GCodeExtrusionRole::InternalInfill;
- else if (role == L("Solid infill"))
- return GCodeExtrusionRole::SolidInfill;
- else if (role == L("Top solid infill"))
- return GCodeExtrusionRole::TopSolidInfill;
- else if (role == L("Ironing"))
- return GCodeExtrusionRole::Ironing;
- else if (role == L("Bridge infill"))
- return GCodeExtrusionRole::BridgeInfill;
- else if (role == L("Gap fill"))
- return GCodeExtrusionRole::GapFill;
- else if (role == L("Skirt") || role == L("Skirt/Brim")) // "Skirt" is for backward compatibility with 2.3.1 and earlier
- return GCodeExtrusionRole::Skirt;
- else if (role == L("Support material"))
- return GCodeExtrusionRole::SupportMaterial;
- else if (role == L("Support material interface"))
- return GCodeExtrusionRole::SupportMaterialInterface;
- else if (role == L("Wipe tower"))
- return GCodeExtrusionRole::WipeTower;
- else if (role == L("Custom"))
- return GCodeExtrusionRole::Custom;
- else
- return GCodeExtrusionRole::None;
-}
-
-}
diff --git a/src/libslic3r/ExtrusionRole.hpp b/src/libslic3r/ExtrusionRole.hpp
deleted file mode 100644
index e6e4300fc3..0000000000
--- a/src/libslic3r/ExtrusionRole.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-///|/ Copyright (c) 2023 Robert Schiele @schiele
-///|/ Copyright (c) Prusa Research 2023 Vojtěch Bubník @bubnikv
-///|/
-///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
-///|/
-#ifndef slic3r_ExtrusionRole_hpp_
-#define slic3r_ExtrusionRole_hpp_
-
-#include "enum_bitmask.hpp"
-#include "ExtrusionEntity.hpp"
-
-#include
-#include
-#include
-
-namespace Slic3r {
-
-enum class ExtrusionRoleModifier : uint16_t {
-// 1) Extrusion types
- // Perimeter (external, inner, ...)
- Perimeter,
- // Infill (top / bottom / solid inner / sparse inner / bridging inner ...)
- Infill,
- // Variable width extrusion
- Thin,
- // Support material extrusion
- Support,
- Skirt,
- Wipe,
-// 2) Extrusion modifiers
- External,
- Solid,
- Ironing,
- Bridge,
-// 3) Special types
- // Indicator that the extrusion role was mixed from multiple differing extrusion roles,
- // for example from Support and SupportInterface.
- Mixed,
- // Stopper, there should be maximum 16 modifiers defined for uint16_t bit mask.
- Count
-};
-// There should be maximum 16 modifiers defined for uint16_t bit mask.
-static_assert(int(ExtrusionRoleModifier::Count) <= 16, "ExtrusionRoleModifier: there must be maximum 16 modifiers defined to fit a 16 bit bitmask");
-
-using ExtrusionRoleModifiers = enum_bitmask;
-ENABLE_ENUM_BITMASK_OPERATORS(ExtrusionRoleModifier);
-
-
-
-// Be careful when editing this list as many parts of the code depend
-// on the values of these ordinars, for example
-// GCodeViewer::Extrusion_Role_Colors
-enum class GCodeExtrusionRole : uint8_t {
- None,
- Perimeter,
- ExternalPerimeter,
- OverhangPerimeter,
- InternalInfill,
- SolidInfill,
- TopSolidInfill,
- Ironing,
- BridgeInfill,
- GapFill,
- Skirt,
- SupportMaterial,
- SupportMaterialInterface,
- WipeTower,
- // Custom (user defined) G-code block, for example start / end G-code.
- Custom,
- // Stopper to count number of enums.
- Count
-};
-
-// Convert a rich bitmask based ExtrusionRole to a less expressive ordinal GCodeExtrusionRole.
-// GCodeExtrusionRole is to be serialized into G-code and deserialized by G-code viewer,
-GCodeExtrusionRole extrusion_role_to_gcode_extrusion_role(ExtrusionRole role);
-
-std::string gcode_extrusion_role_to_string(GCodeExtrusionRole role);
-GCodeExtrusionRole string_to_gcode_extrusion_role(const std::string_view role);
-
-}
-
-#endif // slic3r_ExtrusionRole_hpp_
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 450d3989cd..b5ed23faee 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -4177,7 +4177,7 @@ LayerResult GCode::process_layer(
m_last_obj_copy = this_object_copy;
this->set_origin(unscale(offset));
//FIXME the following code prints regions in the order they are defined, the path is not optimized in any way.
- bool is_infill_first =print.config().is_infill_first;
+ bool is_infill_first =m_config.is_infill_first;
auto has_infill = [](const std::vector &by_region) {
for (auto region : by_region) {
diff --git a/src/libslic3r/GCode/PressureEqualizer.cpp b/src/libslic3r/GCode/PressureEqualizer.cpp
index 67e23c914e..2c528e28b9 100644
--- a/src/libslic3r/GCode/PressureEqualizer.cpp
+++ b/src/libslic3r/GCode/PressureEqualizer.cpp
@@ -3,6 +3,7 @@
///|/
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
///|/
+#include
#include
#include
#include
@@ -45,7 +46,7 @@ PressureEqualizer::PressureEqualizer(const Slic3r::GCodeConfig &config) : m_use_
m_current_extruder = 0;
// Zero the position of the XYZE axes + the current feed
memset(m_current_pos, 0, sizeof(float) * 5);
- m_current_extrusion_role = GCodeExtrusionRole::None;
+ m_current_extrusion_role = ExtrusionRole::erNone;
// Expect the first command to fill the nozzle (deretract).
m_retracted = true;
@@ -74,7 +75,7 @@ PressureEqualizer::PressureEqualizer(const Slic3r::GCodeConfig &config) : m_use_
}
// Don't regulate the pressure before and after ironing.
- for (const GCodeExtrusionRole er : {GCodeExtrusionRole::Ironing}) {
+ for (const ExtrusionRole er : {ExtrusionRole::erIroning}) {
m_max_volumetric_extrusion_rate_slopes[size_t(er)].negative = 0;
m_max_volumetric_extrusion_rate_slopes[size_t(er)].positive = 0;
}
@@ -260,7 +261,7 @@ bool PressureEqualizer::process_line(const char *line, const char *line_end, GCo
if (strncmp(line, EXTRUSION_ROLE_TAG.data(), EXTRUSION_ROLE_TAG.length()) == 0) {
line += EXTRUSION_ROLE_TAG.length();
int role = atoi(line);
- m_current_extrusion_role = GCodeExtrusionRole(role);
+ m_current_extrusion_role = ExtrusionRole(role);
#ifdef PRESSURE_EQUALIZER_DEBUG
++line_idx;
#endif
@@ -589,8 +590,7 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
if (line_idx == fist_line_idx || !m_gcode_lines[line_idx].extruding())
// Nothing to do, the last move is not extruding.
return;
-
- std::array feedrate_per_extrusion_role{};
+ std::array feedrate_per_extrusion_role{};
feedrate_per_extrusion_role.fill(std::numeric_limits::max());
feedrate_per_extrusion_role[int(m_gcode_lines[line_idx].extrusion_role)] = m_gcode_lines[line_idx].volumetric_extrusion_rate_start;
@@ -600,7 +600,7 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
if (!m_gcode_lines[idx_prev].extruding())
break;
// Don't decelerate before ironing.
- if (m_gcode_lines[line_idx].extrusion_role == GCodeExtrusionRole::Ironing) { line_idx = idx_prev;
+ if (m_gcode_lines[line_idx].extrusion_role == ExtrusionRole::erIroning) { line_idx = idx_prev;
continue;
}
// Volumetric extrusion rate at the start of the succeding segment.
@@ -609,10 +609,10 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
line_idx = idx_prev;
GCodeLine &line = m_gcode_lines[line_idx];
- for (size_t iRole = 1; iRole < size_t(GCodeExtrusionRole::Count); ++ iRole) {
+ for (size_t iRole = 1; iRole < size_t(ExtrusionRole::erCount); ++ iRole) {
const float &rate_slope = m_max_volumetric_extrusion_rate_slopes[iRole].negative;
if (rate_slope == 0 || feedrate_per_extrusion_role[iRole] == std::numeric_limits::max())
- continue; // The negative rate is unlimited or the rate for GCodeExtrusionRole iRole is unlimited.
+ continue; // The negative rate is unlimited or the rate for ExtrusionRole iRole is unlimited.
float rate_end = feedrate_per_extrusion_role[iRole];
if (iRole == size_t(line.extrusion_role) && rate_succ < rate_end)
@@ -620,7 +620,7 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
rate_end = rate_succ;
// don't alter the flow rate for these extrusion types
- if (!line.adjustable_flow || line.extrusion_role == GCodeExtrusionRole::BridgeInfill || line.extrusion_role == GCodeExtrusionRole::Ironing) {
+ if (!line.adjustable_flow || line.extrusion_role == ExtrusionRole::erBridgeInfill || line.extrusion_role == ExtrusionRole::erIroning) {
rate_end = line.volumetric_extrusion_rate_end;
} else if (line.volumetric_extrusion_rate_end > rate_end) {
line.volumetric_extrusion_rate_end = rate_end;
@@ -644,7 +644,7 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
}
// feedrate_per_extrusion_role[iRole] = (iRole == line.extrusion_role) ? line.volumetric_extrusion_rate_start : rate_start;
// Don't store feed rate for ironing
- if (line.extrusion_role != GCodeExtrusionRole::Ironing)
+ if (line.extrusion_role != ExtrusionRole::erIroning)
feedrate_per_extrusion_role[iRole] = line.volumetric_extrusion_rate_start;
}
}
@@ -659,7 +659,7 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
if (!m_gcode_lines[idx_next].extruding())
break;
// Don't accelerate after ironing.
- if (m_gcode_lines[line_idx].extrusion_role == GCodeExtrusionRole::Ironing) {
+ if (m_gcode_lines[line_idx].extrusion_role == ExtrusionRole::erIroning) {
line_idx = idx_next;
continue;
}
@@ -668,14 +668,14 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
line_idx = idx_next;
GCodeLine &line = m_gcode_lines[line_idx];
- for (size_t iRole = 1; iRole < size_t(GCodeExtrusionRole::Count); ++ iRole) {
+ for (size_t iRole = 1; iRole < size_t(ExtrusionRole::erCount); ++ iRole) {
const float &rate_slope = m_max_volumetric_extrusion_rate_slopes[iRole].positive;
if (rate_slope == 0 || feedrate_per_extrusion_role[iRole] == std::numeric_limits::max())
- continue; // The positive rate is unlimited or the rate for GCodeExtrusionRole iRole is unlimited.
+ continue; // The positive rate is unlimited or the rate for ExtrusionRole iRole is unlimited.
float rate_start = feedrate_per_extrusion_role[iRole];
// don't alter the flow rate for these extrusion types
- if (!line.adjustable_flow || line.extrusion_role == GCodeExtrusionRole::BridgeInfill || line.extrusion_role == GCodeExtrusionRole::Ironing) {
+ if (!line.adjustable_flow || line.extrusion_role == ExtrusionRole::erBridgeInfill || line.extrusion_role == ExtrusionRole::erIroning) {
rate_start = line.volumetric_extrusion_rate_start;
} else if (iRole == size_t(line.extrusion_role) && rate_prec < rate_start)
rate_start = rate_prec;
@@ -701,7 +701,7 @@ void PressureEqualizer::adjust_volumetric_rate(const size_t fist_line_idx, const
}
// feedrate_per_extrusion_role[iRole] = (iRole == line.extrusion_role) ? line.volumetric_extrusion_rate_end : rate_end;
// Don't store feed rate for ironing
- if (line.extrusion_role != GCodeExtrusionRole::Ironing)
+ if (line.extrusion_role != ExtrusionRole::erIroning)
feedrate_per_extrusion_role[iRole] = line.volumetric_extrusion_rate_end;
}
}
@@ -785,7 +785,7 @@ void PressureEqualizer::push_line_to_output(const size_t line_idx, const float n
GCodeG1Formatter feedrate_formatter;
feedrate_formatter.emit_f(new_feedrate);
feedrate_formatter.emit_string(std::string(EXTRUDE_SET_SPEED_TAG.data(), EXTRUDE_SET_SPEED_TAG.length()));
- if (line.extrusion_role == GCodeExtrusionRole::ExternalPerimeter)
+ if (line.extrusion_role == ExtrusionRole::erExternalPerimeter)
feedrate_formatter.emit_string(std::string(EXTERNAL_PERIMETER_TAG.data(), EXTERNAL_PERIMETER_TAG.length()));
push_to_output(feedrate_formatter);
diff --git a/src/libslic3r/GCode/PressureEqualizer.hpp b/src/libslic3r/GCode/PressureEqualizer.hpp
index 1e9f013396..6eb799bbed 100644
--- a/src/libslic3r/GCode/PressureEqualizer.hpp
+++ b/src/libslic3r/GCode/PressureEqualizer.hpp
@@ -8,7 +8,6 @@
#include "../libslic3r.h"
#include "../PrintConfig.hpp"
-#include "../ExtrusionRole.hpp"
#include
@@ -70,7 +69,7 @@ private:
float positive;
float negative;
};
- ExtrusionRateSlope m_max_volumetric_extrusion_rate_slopes[size_t(GCodeExtrusionRole::Count)];
+ ExtrusionRateSlope m_max_volumetric_extrusion_rate_slopes[size_t(ExtrusionRole::erCount)];
float m_max_volumetric_extrusion_rate_slope_positive;
float m_max_volumetric_extrusion_rate_slope_negative;
@@ -82,7 +81,7 @@ private:
// X,Y,Z,E,F
float m_current_pos[5];
size_t m_current_extruder;
- GCodeExtrusionRole m_current_extrusion_role;
+ ExtrusionRole m_current_extrusion_role;
bool m_retracted;
bool m_use_relative_e_distances;
@@ -158,7 +157,7 @@ private:
// Index of the active extruder.
size_t extruder_id;
// Extrusion role of this segment.
- GCodeExtrusionRole extrusion_role;
+ ExtrusionRole extrusion_role;
// Current volumetric extrusion rate.
float volumetric_extrusion_rate;
diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp
index c6e81e994f..a5aaf4e00b 100644
--- a/src/libslic3r/GCode/ToolOrdering.cpp
+++ b/src/libslic3r/GCode/ToolOrdering.cpp
@@ -1047,7 +1047,7 @@ float WipingExtrusions::mark_wiping_extrusions(const Print& print, unsigned int
if (!object->config().flush_into_infill && !object->config().flush_into_objects && !object->config().flush_into_support)
continue;
bool wipe_into_infill_only = !object->config().flush_into_objects && object->config().flush_into_infill;
- bool is_infill_first = print.config().is_infill_first;
+ bool is_infill_first = region.config().is_infill_first;
if (is_infill_first != perimeters_done || wipe_into_infill_only) {
for (const ExtrusionEntity* ee : layerm->fills.entities) { // iterate through all infill Collections
auto* fill = dynamic_cast(ee);
@@ -1160,7 +1160,7 @@ void WipingExtrusions::ensure_perimeters_infills_order(const Print& print)
if (!object->config().flush_into_infill && !object->config().flush_into_objects)
continue;
- bool is_infill_first = print.config().is_infill_first;
+ bool is_infill_first = region.config().is_infill_first;
for (const ExtrusionEntity* ee : layerm->fills.entities) { // iterate through all infill Collections
auto* fill = dynamic_cast(ee);
diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp
index 4774d5fae2..b9ab63cf86 100644
--- a/src/libslic3r/PerimeterGenerator.cpp
+++ b/src/libslic3r/PerimeterGenerator.cpp
@@ -1731,7 +1731,7 @@ void PerimeterGenerator::process_classic()
// if brim will be printed, reverse the order of perimeters so that
// we continue inwards after having finished the brim
// TODO: add test for perimeter order
- bool is_outer_wall_first = this->object_config->wall_sequence == WallSequence::OuterInner;
+ bool is_outer_wall_first = this->config->wall_sequence == WallSequence::OuterInner;
if (is_outer_wall_first ||
//BBS: always print outer wall first when there indeed has brim.
(this->layer_id == 0 &&
@@ -1739,7 +1739,7 @@ void PerimeterGenerator::process_classic()
this->object_config->brim_width.value > 0))
entities.reverse();
// SoftFever: sandwich mode
- else if (this->object_config->wall_sequence == WallSequence::InnerOuterInner)
+ else if (this->config->wall_sequence == WallSequence::InnerOuterInner)
if (entities.entities.size() > 1){
int last_outer=0;
int outer = 0;
@@ -2036,12 +2036,12 @@ void PerimeterGenerator::process_arachne()
int direction = -1;
bool is_outer_wall_first =
- this->object_config->wall_sequence == WallSequence::OuterInner ||
- this->object_config->wall_sequence == WallSequence::InnerOuterInner;
+ this->config->wall_sequence == WallSequence::OuterInner ||
+ this->config->wall_sequence == WallSequence::InnerOuterInner;
if (layer_id == 0){ // disable inner outer inner algorithm after the first layer
is_outer_wall_first =
- this->object_config->wall_sequence == WallSequence::OuterInner;
+ this->config->wall_sequence == WallSequence::OuterInner;
}
if (is_outer_wall_first) {
start_perimeter = 0;
@@ -2169,7 +2169,7 @@ void PerimeterGenerator::process_arachne()
}
// printf("New Layer: Layer ID %d\n",layer_id); //debug - new layer
- if (this->object_config->wall_sequence == WallSequence::InnerOuterInner && layer_id > 0) { // only enable inner outer inner algorithm after first layer
+ if (this->config->wall_sequence == WallSequence::InnerOuterInner && layer_id > 0) { // only enable inner outer inner algorithm after first layer
if (ordered_extrusions.size() > 2) { // 3 walls minimum needed to do inner outer inner ordering
int position = 0; // index to run the re-ordering for multiple external perimeters in a single island.
int arr_i, arr_j = 0; // indexes to run through the walls in the for loops
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index 7b88767b93..43a3a30eb2 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -753,7 +753,6 @@ PRINT_CONFIG_CLASS_DEFINE(
// BBS
((ConfigOptionBool, flush_into_infill))
((ConfigOptionBool, flush_into_support))
- ((ConfigOptionEnum, wall_sequence))
// BBS
((ConfigOptionFloat, tree_support_branch_distance))
((ConfigOptionFloat, tree_support_tip_diameter))
@@ -903,6 +902,9 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionBool, overhang_reverse))
((ConfigOptionBool, overhang_reverse_internal_only))
((ConfigOptionFloatOrPercent, overhang_reverse_threshold))
+
+ ((ConfigOptionEnum, wall_sequence))
+ ((ConfigOptionBool, is_infill_first))
)
PRINT_CONFIG_CLASS_DEFINE(
@@ -1179,7 +1181,6 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
((ConfigOptionBools, activate_chamber_temp_control))
((ConfigOptionInts , chamber_temperature))
- ((ConfigOptionBool, is_infill_first))
((ConfigOptionFloat, preferred_orientation))
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 866d9224a8..28c8c45cc4 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -916,6 +916,7 @@ bool PrintObject::invalidate_state_by_config_options(
|| opt_key == "min_width_top_surface"
|| opt_key == "only_one_wall_first_layer"
|| opt_key == "extra_perimeters_on_overhangs"
+ || opt_key == "detect_overhang_wall"
|| opt_key == "initial_layer_line_width"
|| opt_key == "inner_wall_line_width"
|| opt_key == "infill_wall_overlap"
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index cd751b8c47..96e2963229 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -4504,16 +4504,17 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
return ret;
};
- auto calculate_offsets = [max_width, window_padding](const std::vector>>& title_columns, float extra_size = 0.0f) {
+ auto calculate_offsets = [&imgui, max_width, window_padding](const std::vector>>& title_columns, float extra_size = 0.0f) {
const ImGuiStyle& style = ImGui::GetStyle();
std::vector offsets;
offsets.push_back(max_width(title_columns[0].second, title_columns[0].first, extra_size) + 3.0f * style.ItemSpacing.x);
for (size_t i = 1; i < title_columns.size() - 1; i++)
offsets.push_back(offsets.back() + max_width(title_columns[i].second, title_columns[i].first) + style.ItemSpacing.x);
if (title_columns.back().first == _u8L("Display")) {
- const auto preferred_offset = ImGui::GetWindowWidth() - ImGui::CalcTextSize(_u8L("Display").c_str()).x - ImGui::GetFrameHeight() / 2 - 2 * window_padding;
+ const auto preferred_offset = ImGui::GetWindowWidth() - ImGui::CalcTextSize(_u8L("Display").c_str()).x - ImGui::GetFrameHeight() / 2 - 2 * window_padding - ImGui::GetStyle().ScrollbarSize;
if (preferred_offset > offsets.back()) {
offsets.back() = preferred_offset;
+ imgui.set_requires_extra_frame();
}
}
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
index 709cd47257..140bed7565 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
@@ -110,7 +110,9 @@ void SelectionInfo::on_update()
m_model_object = nullptr;
- if (selection.is_single_full_instance()) {
+ // BBS still keep object pointer when selection is volume
+ // if (selection.is_single_full_instance()) {
+ if (!selection.is_empty()) {
m_model_object = selection.get_model()->objects[selection.get_object_idx()];
m_z_shift = selection.get_first_volume()->get_sla_shift_z();
}
diff --git a/src/slic3r/GUI/Widgets/SideTools.cpp b/src/slic3r/GUI/Widgets/SideTools.cpp
index 7ebda1fdfd..c226b39e6c 100644
--- a/src/slic3r/GUI/Widgets/SideTools.cpp
+++ b/src/slic3r/GUI/Widgets/SideTools.cpp
@@ -272,8 +272,8 @@ SideTools::SideTools(wxWindow *parent, wxWindowID id, const wxPoint &pos, const
wxBoxSizer* connection_sizer_V = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* connection_sizer_H = new wxBoxSizer(wxHORIZONTAL);
- // m_hyperlink = new wxHyperlinkCtrl(m_connection_info, wxID_ANY, _L("Failed to connect to the server"), wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-connect-printer"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
- // m_hyperlink->SetBackgroundColour(wxColour(255, 111, 0));
+ m_hyperlink = new wxHyperlinkCtrl(m_connection_info, wxID_ANY, _L("Failed to connect to the server"), wxT("https://wiki.bambulab.com/en/software/bambu-studio/failed-to-connect-printer"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
+ m_hyperlink->SetBackgroundColour(wxColour(255, 111, 0));
m_more_err_open = ScalableBitmap(this, "monitir_err_open", 16);
m_more_err_close = ScalableBitmap(this, "monitir_err_close", 16);
@@ -302,7 +302,7 @@ SideTools::SideTools(wxWindow *parent, wxWindowID id, const wxPoint &pos, const
});
- // connection_sizer_H->Add(m_hyperlink, 0, wxALIGN_CENTER | wxALL, 5);
+ connection_sizer_H->Add(m_hyperlink, 0, wxALIGN_CENTER | wxALL, 5);
connection_sizer_H->Add(m_more_button, 0, wxALIGN_CENTER | wxALL, 3);
connection_sizer_V->Add(connection_sizer_H, 0, wxALIGN_CENTER, 0);