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"

This reverts commit b856b787.

Unfortunately it turned out not to work on Wayland yet.

This reverts commit c2306cb5.

The location icon changed to the gps icon instead of the file location
one

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"

The dialer was moved to plasma-dialer in [1]. It pulled in
KF5{Declarative,DBusAddons,Notifications} which are now no longer
needed.
While at it, also group in one call, which respects KF5_MIN_VERSION
for all packages, and sort it.

[1] 6107e39f

In the Logout popup dialog, a cancel button enables the users to cancel
the logout process.

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"

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"

Caused runtime issues

This has been split into separate repository at :
https://invent.kde.org/kde/plasma-dialer/

Bhushan Shah authored Mar 12, 2020 and Bhushan Shah committed Mar 16, 2020

While dial functions are not working when SIM account is not present it
is perfectly valid to open dialer to check e.g. Call history.

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"