GitLab

(cherry picked from commit 687a8da1)

(cherry picked from commit 2e6fc2a8)

Without it, kajongg doesn't run at all

(cherry picked from commit f40118d9)

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"

It's unneeded and breaks pedantic checkers

(cherry picked from commit 69d5f6bd)

found by pylint only after porting to qtpy

because it should not override QGraphicsItem.hasFocus