GitLab

(cherry picked from commit f0f804e1)

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"

(cherry picked from commit a4a93dd4)

(cherry picked from commit 18066041)

(cherry picked from commit e97c1983)