(cherry picked from commit 38738e23)

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

(cherry picked from commit b49f72c0)

(cherry picked from commit fe62794e)

(cherry picked from commit d48e2594)

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