Jelle Spijker 06e140a0fa Merge branch '5.3' ... # Conflicts: # resources/i18n/es_ES/fdmprinter.def.json.po # resources/i18n/fr_FR/fdmprinter.def.json.po # resources/i18n/ja_JP/cura.po # resources/i18n/ja_JP/fdmprinter.def.json.po # resources/i18n/ko_KR/cura.po # resources/i18n/nl_NL/cura.po # resources/i18n/nl_NL/fdmprinter.def.json.po # resources/i18n/ru_RU/fdmprinter.def.json.po		2023-04-06 17:52:54 +02:00
..
cura.po	Merge branch '5.3'	2023-04-06 17:52:54 +02:00
fdmextruder.def.json.po	Ensured that header has 20 lines	2023-03-08 09:08:41 +01:00
fdmprinter.def.json.po	Merge Smartling translations	2023-04-06 14:24:34 +02:00