(cherry picked from commit ecfb106f)

(cherry picked from commit 1c3766d8)

Only add it when it actually works, use a work branch to test.

BUG: 451752



Thanks-to: Duncan <1i5t5.duncan@cox.net>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

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"

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 10a8b1ea)

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 4384ad6a)

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

(cherry picked from commit 4262052e)