mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 03:43:52 +00:00
merge conflicts
This commit is contained in:
@@ -647,7 +647,7 @@ msgid "Angle"
|
||||
msgstr "Hoek"
|
||||
|
||||
msgid ""
|
||||
"Embeded\n"
|
||||
"Embedded\n"
|
||||
"depth"
|
||||
msgstr "Embedded depth"
|
||||
|
||||
@@ -1115,7 +1115,7 @@ msgstr ""
|
||||
msgid "Undefined stroke type"
|
||||
msgstr ""
|
||||
|
||||
msgid "Path can't be healed from selfintersection and multiple points."
|
||||
msgid "Path can't be healed from self-intersection and multiple points."
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
@@ -1487,8 +1487,8 @@ msgid "Some presets are modified."
|
||||
msgstr "Sommige voorinstellingen zijn aangepast."
|
||||
|
||||
msgid ""
|
||||
"You can keep the modifield presets to the new project, discard or save "
|
||||
"changes as new presets."
|
||||
"You can keep the modified presets to the new project, discard or save changes as new "
|
||||
"presets."
|
||||
msgstr ""
|
||||
"Je kunt de aangepaste voorinstellingen bewaren voor het nieuwe project ze "
|
||||
"laten vervallen of opslaan als nieuwe voorinstelling."
|
||||
@@ -1574,7 +1574,7 @@ msgid "Orca Slicer GUI initialization failed"
|
||||
msgstr "Initialisatie van Orca Slicer GUI is mislukt"
|
||||
|
||||
#, boost-format
|
||||
msgid "Fatal error, exception catched: %1%"
|
||||
msgid "Fatal error, exception caught: %1%"
|
||||
msgstr "Fatale fout, uitzondering tegengehouden: %1%"
|
||||
|
||||
msgid "Quality"
|
||||
@@ -2080,8 +2080,8 @@ msgid ""
|
||||
"This action will break a cut correspondence.\n"
|
||||
"After that model consistency can't be guaranteed .\n"
|
||||
"\n"
|
||||
"To manipulate with solid parts or negative volumes you have to invalidate "
|
||||
"cut infornation first."
|
||||
"To manipulate with solid parts or negative volumes you have to invalidate cut information "
|
||||
"first."
|
||||
msgstr ""
|
||||
"This action will break a cut correspondence.\n"
|
||||
"After that, model consistency can't be guaranteed .\n"
|
||||
@@ -2095,10 +2095,8 @@ msgstr "Verwijder alle vberbindingen"
|
||||
msgid "Deleting the last solid part is not allowed."
|
||||
msgstr "Het is niet toegestaand om het laaste vaste deel te verwijderen."
|
||||
|
||||
msgid "The target object contains only one part and can not be splited."
|
||||
msgstr ""
|
||||
"Het doelbestand bevat slechts 1 onderdeel en kan daarom niet worden "
|
||||
"opgesplitst."
|
||||
msgid "The target object contains only one part and can not be split."
|
||||
msgstr "Het doelbestand bevat slechts 1 onderdeel en kan daarom niet worden opgesplitst."
|
||||
|
||||
msgid "Assembly"
|
||||
msgstr "Montage"
|
||||
@@ -2485,7 +2483,7 @@ msgstr ""
|
||||
"De geselecteerde objecten bevinden zich op een vergrendeld printbed.\n"
|
||||
"Deze objecten kunnen niet automatisch worden gerangschikt."
|
||||
|
||||
msgid "No arrangable objects are selected."
|
||||
msgid "No arrangeable objects are selected."
|
||||
msgstr "Er zijn geen objecten geselecteerd die geschikt kunnen worden."
|
||||
|
||||
msgid ""
|
||||
@@ -3249,7 +3247,7 @@ msgid ""
|
||||
"Error message: %1%.\n"
|
||||
"Source file %2%."
|
||||
msgstr ""
|
||||
"Het is niet gelukt het gcode bestand op te slaan.\n"
|
||||
"Het is niet gelukt het G-code bestand op te slaan.\n"
|
||||
"Foutmelding: %1%.\n"
|
||||
"Bronbestand %2%."
|
||||
|
||||
@@ -3665,9 +3663,8 @@ msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Change these settings automatically? \n"
|
||||
"Yes - Change ensure vertical shell thickness to Moderate and enable "
|
||||
"alternate extra wall\n"
|
||||
"No - Dont use alternate extra wall"
|
||||
"Yes - Change ensure vertical shell thickness to Moderate and enable alternate extra wall\n"
|
||||
"No - Don't use alternate extra wall"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
@@ -3909,7 +3906,7 @@ msgid "Selected diameter and machine diameter do not match"
|
||||
msgstr "Geselecteerde diameter en machinediameter komen niet overeen"
|
||||
|
||||
msgid "Failed to generate cali gcode"
|
||||
msgstr "Cali gcode niet gegenereerd"
|
||||
msgstr "Cali G-code niet gegenereerd"
|
||||
|
||||
msgid "Calibration error"
|
||||
msgstr "Kalibratiefout"
|
||||
@@ -4778,7 +4775,7 @@ msgstr "Orthogonale weergave gebruiken"
|
||||
msgid "Show &G-code Window"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show g-code window in Previce scene"
|
||||
msgid "Show g-code window in Preview scene"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show 3D Navigator"
|
||||
@@ -5185,7 +5182,7 @@ msgstr "Do you want to delete the file '%s' from printer?"
|
||||
msgid "Delete file"
|
||||
msgstr "Delete file"
|
||||
|
||||
msgid "Fetching model infomations ..."
|
||||
msgid "Fetching model information..."
|
||||
msgstr "Fetching model information..."
|
||||
|
||||
msgid "Failed to fetch model information from printer."
|
||||
@@ -5458,7 +5455,7 @@ msgstr "Informatie"
|
||||
msgid "Get oss config failed."
|
||||
msgstr "Het ophalen van de oss-configuratie is mislukt."
|
||||
|
||||
msgid "Upload Pictrues"
|
||||
msgid "Upload Pictures"
|
||||
msgstr "Upload Pictures"
|
||||
|
||||
msgid "Number of images successfully uploaded"
|
||||
@@ -7965,7 +7962,7 @@ msgid "Accessory"
|
||||
msgstr "Accessoire"
|
||||
|
||||
msgid "Machine gcode"
|
||||
msgstr "Machine G-code"
|
||||
msgstr "Machine gcode"
|
||||
|
||||
msgid "Machine start G-code"
|
||||
msgstr "Machine start G-code"
|
||||
@@ -9059,7 +9056,7 @@ msgid ""
|
||||
"Failed to generate gcode for invalid custom G-code.\n"
|
||||
"\n"
|
||||
msgstr ""
|
||||
"Kan gcode niet genereren voor ongeldige handmatige G-code.\n"
|
||||
"Kan G-code niet genereren voor ongeldige handmatige G-code.\n"
|
||||
"\n"
|
||||
|
||||
msgid "Please check the custom G-code or use the default custom G-code."
|
||||
@@ -13888,7 +13885,7 @@ msgid "No check"
|
||||
msgstr "Geen controle"
|
||||
|
||||
msgid "Do not run any validity checks, such as gcode path conflicts check."
|
||||
msgstr "Do not run any validity checks, such as G-code path conflicts check."
|
||||
msgstr "Do not run any validity checks, such as gcode path conflicts check."
|
||||
|
||||
msgid "Ensure on bed"
|
||||
msgstr "Plaats op bed"
|
||||
|
||||
Reference in New Issue
Block a user