GitLab

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"

inline not in private header

BUG: 380487
FIXED-IN: 5.5.45

(cherry picked from commit 4048f5e4)

A PGP Block, that is no real block so we need to render as a normal
Textblock.