This should fix the binary factory build, but it unfortunately not backward
compatible below Qt 5.15.8. Qt 6 will need the same changes anyway, so it's
not all bad at least.

adapt to in tree i18n

This reverts commit 61b64b56

They end up needlessly in the APK otherwise.

Helps with scanning under bad light conditions.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"