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"

BUGS: 455871

This reverts commit 39fa592e.

After discussion on IRC I learned that this an old URL, which will go
away. File an issue with appstream which warns about the URL returning
302 [1]

[1] https://github.com/ximion/appstream/issues/394

Makes appstreamcli validate happier.

GIT_SILENT

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 526ec4ee)

(cherry picked from commit 3fb59b24)

GIT_SILENT

(cherry picked from commit 12d133ed)

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 444adb8e)

(cherry picked from commit 9034b6fe)