(cherry picked from commit e2c59623)

(cherry picked from commit 4d8b50cf)

Qt6 job doesn't actually work. Please use merge requests to change CI
configuration so it's tested before merging.

This reverts commit 089c90b2.

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"

now done in libksane itself