Resolve weblate merge conflicts

A typo in english translation was fixed, causing weblate to reformat the whole file, but this file was also changed in develop via an MR, causing a merge conflict on weblate side

enabled an automatic merge when the pipeline for ca52a732 succeeds

canceled the automatic merge

merged

mentioned in commit 671ecfb1