(cherry picked from commit 8198882a)

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 bf5ba081)

(cherry picked from commit c3e4dee3)

(cherry picked from commit 605fe926)

(cherry picked from commit 41c476d4)

(cherry picked from commit 9277f22b)