GitLab

GIT_SILENT: we need to add KDEClangFormat* as we don't use KDEFrameworkCompilerSettings.cmake otherwise .clang-format is not generated

Add Stefan Taferner (original author) and David Bryant (documentation) to "About Authors". Spell König correctly (we're using UTF-8 now).

(cherry picked from commit 0ae88f3a)

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 7647c3f2)