(cherry picked from commit f4280e63)

(cherry picked from commit c69d0158)

(cherry picked from commit e127825d)

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 59fb109f)