merge conflicts

localization/i18n/sv/OrcaSlicer_sv.po

@@ -640,7 +640,7 @@ msgid "Angle"
 msgstr "Vinkel"
 
 msgid ""
-"Embeded\n"
+"Embedded\n"
 "depth"
 msgstr "Inbäddat djup"
 
@@ -1100,11 +1100,11 @@ 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 ""
-"Final shape constains selfintersection or multiple points with same "
+"Final shape contains self-intersection or multiple points with same "
 "coordinate."
 msgstr ""
 
@@ -1461,7 +1461,7 @@ msgid "Some presets are modified."
 msgstr "Några inställningar har ändrats."
 
 msgid ""
-"You can keep the modifield presets to the new project, discard or save "
+"You can keep the modified presets to the new project, discard or save "
 "changes as new presets."
 msgstr ""
 "Fortsätt med redigerings inställningarna till nytt projekt, avfärda dem "
@@ -1548,7 +1548,7 @@ msgid "Orca Slicer GUI initialization failed"
 msgstr "Orca Slicer GUI-initiering misslyckades"
 
 #, boost-format
-msgid "Fatal error, exception catched: %1%"
+msgid "Fatal error, exception caught: %1%"
 msgstr "Allvarligt fel, undantag hittat: %1%"
 
 msgid "Quality"
@@ -2045,7 +2045,7 @@ msgid ""
 "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."
+"cut information first."
 msgstr ""
 "Denna åtgärd kommer att bryta en skuren korrespondens.\n"
 "Därefter kan inte modell konsistens garanteras .\n"
@@ -2059,7 +2059,7 @@ msgstr "Ta bort alla kopplingar"
 msgid "Deleting the last solid part is not allowed."
 msgstr "Ej tillåtet att radera den senaste fasta delen."
 
-msgid "The target object contains only one part and can not be splited."
+msgid "The target object contains only one part and can not be split."
 msgstr "Det valda objektet innehåller endast en del och kan inte delas."
 
 msgid "Assembly"
@@ -2445,7 +2445,7 @@ msgstr ""
 "Alla valda objekt är på den låsta plattan,\n"
 "det går inte att auto-placera dessa objekten."
 
-msgid "No arrangable objects are selected."
+msgid "No arrangeable objects are selected."
 msgstr "Inga placerbara objekt är valda."
 
 msgid ""
@@ -3140,7 +3140,7 @@ msgstr "Kör efterbearbetnings skript"
 msgid "Successfully executed post-processing script"
 msgstr "Successfully executed post-processing script"
 
-msgid "Unknown error occured during exporting G-code."
+msgid "Unknown error occurred during exporting G-code."
 msgstr ""
 
 #, boost-format
@@ -3601,7 +3601,7 @@ 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"
+"No  - Don't use alternate extra wall"
 msgstr ""
 
 msgid ""
@@ -4708,7 +4708,7 @@ msgstr "Använd Ortogonal Vy"
 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"
@@ -4940,7 +4940,7 @@ msgstr ""
 msgid "Printer camera is malfunctioning."
 msgstr "Printerns kamera fungerar inte som den ska."
 
-msgid "Problem occured. Please update the printer firmware and try again."
+msgid "Problem occurred. Please update the printer firmware and try again."
 msgstr ""
 "Ett problem har uppstått. Uppdatera printerns programvara och försök igen."
 
@@ -5113,7 +5113,7 @@ msgstr "Vill du radera filen '%s' från skrivaren?"
 msgid "Delete file"
 msgstr "Radera fil"
 
-msgid "Fetching model infomations ..."
+msgid "Fetching model information..."
 msgstr "Hämtar information om modellen..."
 
 msgid "Failed to fetch model information from printer."
@@ -5385,7 +5385,7 @@ msgstr "Info"
 msgid "Get oss config failed."
 msgstr "Hämta konfigurationen för oss misslyckades."
 
-msgid "Upload Pictrues"
+msgid "Upload Pictures"
 msgstr "Upload Pictures"
 
 msgid "Number of images successfully uploaded"
@@ -15381,7 +15381,7 @@ msgstr "Connection to Duet is working correctly."
 msgid "Could not connect to Duet"
 msgstr "Kunde inte ansluta till Duet"
 
-msgid "Unknown error occured"
+msgid "Unknown error occurred"
 msgstr "Okänt fel uppstod"
 
 msgid "Wrong password"
@@ -16390,10 +16390,10 @@ msgstr ""
 #~ msgid "Load failed [%d]"
 #~ msgstr "Inläsning misslyckades [%d]"
 
-#~ msgid "Failed to fetching model infomations from printer."
+#~ msgid "Failed to fetching model information from printer."
 #~ msgstr "Det gick inte att hämta modell information från skrivaren."
 
-#~ msgid "Failed to parse model infomations."
+#~ msgid "Failed to parse model information."
 #~ msgstr "Det gick inte att analysera modellinformation"
 
 #~ msgid ""
@@ -16751,7 +16751,7 @@ msgstr ""
 #~ "Visste du att du kan fixa en skadad 3D-modell för att undvika många "
 #~ "berednings problem?"
 
-#~ msgid "Embeded"
+#~ msgid "Embedded"
 #~ msgstr "Inbäddad"
 
 #~ msgid "Online Models"