Conflicts:
resources/i18n/de_DE/fdmprinter.def.json.po -> Improved translations while the translation bureau made new translations.
resources/i18n/pt_BR/cura.po -> For some reason it had a conflict with the last-changed date here. Not sure why but I reverted any changes to this file.