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

The CI system already provides this so it doesn't have any effect there, but this allows to generate correct dependency data for kdesrc-build from .kde-ci.yml

(cherry picked from commit 47ad77c3)

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 49a831ca)

These credentials were created back in Akademy 2019 but were never
shipped because Google never verified the "OAuth consent screen" shown
to the users. (I never understood if Google didn't like something or if
simply no one at Google looked at it).

However, these credentials do work if you go in the "advanced" section
of the oauth screen and click on the "I trust KDE e.V. as developer"
button. So I think is better to ship them anyway, rather than ship the
old credentials that have been broken for years.

The qtkeychain backend is disabled by default anyway and is only a fallback
for those who don't want to use the main KAccounts backend, which is the
recommended one.

CCBUG: 439639
CCMAIL: kde-ev-board@kde.org

Without KAccounts for now, that is not yet available

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"