c.lamboo 86d95f8375 Merge branch 'main' into CURA-10406_fix_project_loading ... # Conflicts: # resources/i18n/cs_CZ/cura.po # resources/i18n/cura.pot # resources/i18n/de_DE/cura.po # resources/i18n/es_ES/cura.po # resources/i18n/fi_FI/cura.po # resources/i18n/fr_FR/cura.po # resources/i18n/hu_HU/cura.po # resources/i18n/it_IT/cura.po # resources/i18n/ja_JP/cura.po # resources/i18n/ko_KR/cura.po # resources/i18n/nl_NL/cura.po # resources/i18n/pl_PL/cura.po # resources/i18n/pt_BR/cura.po # resources/i18n/pt_PT/cura.po # resources/i18n/ru_RU/cura.po # resources/i18n/tr_TR/cura.po # resources/i18n/zh_CN/cura.po # resources/i18n/zh_TW/cura.po		2023-03-17 17:34:13 +01:00
..
cura.po	Merge branch 'main' into CURA-10406_fix_project_loading	2023-03-17 17:34:13 +01:00
fdmextruder.def.json.po	Ensured that header has 20 lines	2023-03-08 09:08:41 +01:00
fdmprinter.def.json.po	update translations	2023-03-16 17:19:42 +00:00