(cherry picked from commit 7e03a2c0)

(cherry picked from commit 6b8911a7)

(cherry picked from commit 383326c0)

(cherry picked from commit b9376e21)

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

(cherry picked from commit 5323f657)

(cherry picked from commit bf59b8cf)

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 266680f7)

(cherry picked from commit aebd480d)

(cherry picked from commit f9111c72)