Fix weblate conflict

[jepler]

weblate said

There has been a merge failure in the repository

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Dutch)
Using index info to reconstruct a base tree...
M	locale/nl.po
Falling back to patching base and 3-way merge...
Auto-merging locale/nl.po
CONFLICT (content): Merge conflict in locale/nl.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Dutch)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)

Check the FAQ for info on how to resolve this.

I followed the FAQ and resolved the problem. Due to inattention, this also includes the changes from #3282 which also relate to translations.

It would be nice to get this merged promptly, because until we do people can't contribute on weblate.

[dhalbert]

👍