Skip to content

Commit

Permalink
Merge branch '5.9' into CURA-12054_fix-3d-view-on-wayland
Browse files Browse the repository at this point in the history
  • Loading branch information
wawanbreton authored Oct 9, 2024
2 parents 55feaaf + 8bb4f98 commit b413251
Show file tree
Hide file tree
Showing 56 changed files with 7,727 additions and 3,960 deletions.
1 change: 0 additions & 1 deletion resources/definitions/ankermake_m5c.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
]
},
"infill_extruder_nr": { "value": -1 },
"infill_line_distance": { "value": 8 },
"infill_material_flow": { "value": 90 },
"infill_pattern": { "value": "'lines' if infill_sparse_density >= 25 else 'grid'" },
"infill_sparse_density": { "value": 10 },
Expand Down
4 changes: 2 additions & 2 deletions resources/definitions/fdmprinter.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -8367,7 +8367,7 @@
"wall_overhang_angle":
{
"label": "Overhanging Wall Angle",
"description": "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either.",
"description": "Walls that overhang more than this angle will be printed using overhanging wall settings. When the value is 90, no walls will be treated as overhanging. Overhang that gets supported by support will not be treated as overhang either. Furthermore, any line that's less than half overhanging will also not be treated as overhang.",
"unit": "\u00b0",
"type": "float",
"minimum_value": "0",
Expand Down Expand Up @@ -8940,7 +8940,7 @@
"scarf_joint_seam_start_height_ratio":
{
"label": "Scarf Seam Start Height",
"description": "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be less than 100 to be effective.",
"description": "The ratio of the selected layer height at which the scarf seam will begin. A lower number will result in a larger seam height. Must be lower than 100 to be effective.",
"type": "float",
"default_value": 0,
"minimum_value": 0,
Expand Down
38 changes: 25 additions & 13 deletions resources/i18n/cs_CZ/cura.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-08 09:05+0200\n"
"POT-Creation-Date: 2024-10-09 14:27+0200\n"
"PO-Revision-Date: 2023-09-03 18:15+0200\n"
"Last-Translator: Miroslav Šustek <[email protected]>\n"
"Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
Expand Down Expand Up @@ -1211,14 +1211,6 @@ msgctxt "name"
msgid "CuraEngine Backend"
msgstr "CuraEngine Backend"

msgctxt "description"
msgid "CuraEngine plugin for gradually smoothing the flow to limit high-flow jumps"
msgstr ""

msgctxt "name"
msgid "CuraEngineGradualFlow"
msgstr ""

msgctxt "@label"
msgid "Currency:"
msgstr "Měna:"
Expand Down Expand Up @@ -1569,6 +1561,10 @@ msgctxt "@title:window"
msgid "Export Material"
msgstr "Exportovat materiál"

msgctxt "@action:inmenu menubar:help"
msgid "Export Package For Technical Support"
msgstr ""

msgctxt "@title:window"
msgid "Export Profile"
msgstr "Exportovat profil"
Expand Down Expand Up @@ -4121,10 +4117,6 @@ msgctxt "@action:inmenu menubar:help"
msgid "Show Online &Documentation"
msgstr "Zobrazit online &dokumentaci"

msgctxt "@action:inmenu"
msgid "Show Online Troubleshooting"
msgstr "Zobrazit online řešení problémů"

msgctxt "@label:checkbox"
msgid "Show all"
msgstr "Zobrazit vše"
Expand Down Expand Up @@ -5064,6 +5056,14 @@ msgctxt "@text"
msgid "Unable to read example data file."
msgstr "Nelze načíst ukázkový datový soubor."

msgctxt "@info:status"
msgid "Unable to send the model data to the engine. Please try again, or contact support."
msgstr ""

msgctxt "@info:status"
msgid "Unable to send the model data to the engine. Please try to use a less detailed model, or reduce the number of instances."
msgstr ""

msgctxt "@info:title"
msgid "Unable to slice"
msgstr "Nelze slicovat"
Expand Down Expand Up @@ -5325,6 +5325,10 @@ msgctxt "description"
msgid "Upgrades configurations from Cura 5.6 to Cura 5.7."
msgstr ""

msgctxt "description"
msgid "Upgrades configurations from Cura 5.8 to Cura 5.9."
msgstr ""

msgctxt "@action:button"
msgid "Upload custom Firmware"
msgstr "Nahrát vlastní firmware"
Expand Down Expand Up @@ -5469,6 +5473,10 @@ msgctxt "name"
msgid "Version Upgrade 5.6 to 5.7"
msgstr ""

msgctxt "name"
msgid "Version Upgrade 5.8 to 5.9"
msgstr ""

msgctxt "@button"
msgid "View printers in Digital Factory"
msgstr "Zobrazit tiskárny v Digital Factory"
Expand Down Expand Up @@ -5847,6 +5855,10 @@ msgstr "Nepovedlo se stáhnout {} zásuvných modulů"
#~ msgid "Save Cura project and print file"
#~ msgstr "Uložit projekt Cura a tiskový soubor UFP"

#~ msgctxt "@action:inmenu"
#~ msgid "Show Online Troubleshooting"
#~ msgstr "Zobrazit online řešení problémů"

#~ msgctxt "@info:title"
#~ msgid "Simulation View"
#~ msgstr "Pohled simulace"
Expand Down
10 changes: 9 additions & 1 deletion resources/i18n/cs_CZ/fdmextruder.def.json.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cura 5.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-03-11 11:28+0000\n"
"POT-Creation-Date: 2024-10-09 14:27+0000\n"
"PO-Revision-Date: 2020-02-20 17:30+0100\n"
"Last-Translator: DenyCZ <www.github.com/DenyCZ>\n"
"Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
Expand Down Expand Up @@ -129,6 +129,10 @@ msgctxt "machine_nozzle_id label"
msgid "Nozzle ID"
msgstr "ID trysky"

msgctxt "machine_nozzle_head_distance label"
msgid "Nozzle Length"
msgstr ""

msgctxt "machine_nozzle_offset_x label"
msgid "Nozzle X Offset"
msgstr "X offset trysky"
Expand Down Expand Up @@ -157,6 +161,10 @@ msgctxt "extruder_nr description"
msgid "The extruder train used for printing. This is used in multi-extrusion."
msgstr "Vytlačovací stroj byl použit pro tisknutí. Toto je používáno při vícenásobné extruzi."

msgctxt "machine_nozzle_head_distance description"
msgid "The height difference between the tip of the nozzle and the lowest part of the print head."
msgstr ""

msgctxt "machine_nozzle_size description"
msgid "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size."
msgstr "Vnitřní průměr trysky. Změňte toto nastavení pokud používáte nestandardní velikost trysky."
Expand Down
Loading

0 comments on commit b413251

Please sign in to comment.