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
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