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"

Friedrich W. H. Kossebau authored Aug 04, 2021 and Laurent Montel committed Aug 06, 2021

Current KCM dialogs do not make use of that property, also has KCMUtils
been broken when it comes to reading the localized variants of the data
as well as reading the list as a list in JSON format

GIT_SILENT

GIT_SILENT

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"

Bind the Delete key to the "Delete" action, and Return to "Edit...".
This finishes off
BUG: 315894

Glen Ditchfield authored Jul 08, 2021 and Glen Ditchfield committed Jul 09, 2021

If a non-recurring to-do has been completed, selecting "Toggle To-do
Completed" from its right-click menu does not make it incomplete, because
`Todo::setPercentComplete(0)` is not sufficient.  This patch brute-forces
all completion-related fields.

CCBUG: 397721

(cherry picked from commit 4f969d04)

Required for: kontact!8
See also https://phabricator.kde.org/T13555#259170

GIT_SILENT

Soon to be deprecated, use the QPalette overload instead.

With
kmail@3d0fcc9c
the plugins are loaded from a specific namespace.

Required for kmail!26

Task: https://phabricator.kde.org/T14501

For more details: !32

GIT_SILENT

This way they're more correct, which means they can work with KHelpCenter
and when falling back to opening the relevant page at docs.kde.org in any
web browser.

See graphics/okular!441 for more
details.