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"

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"

FIXED-IN: 5.17.3
BUG: 439205

This now makes a difference that KPkPass implements date/time detection
and formatting.

Soon to be deprecated, use the QPalette overload instead.

it => remove it