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"

--this way popups are placed even better from
plasma style docks/panels

--improve a lot how applets are positioned in
different alignments and more specific take into
consideration the background roundness and the
items specified length margin in order to provide
always the most consistent look for the user

BUG:433765

--update also Default layout to something
upgraded

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"

--and also at the same time support specific
sidebars based on their names

--this way the new anchoring is totally independent
of parabolic effect

--remove any worksaround concerning the case
that parabolic effect is disabled

--at the same time improve a lot background length
calculations and various alignments published
layout geometry in order to correspond much
better to real visible estate

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 way we can support three different
popup styles. Plasma/AllBorders/Far From Edge

--when the added layout contains errors and warnings
then do not show the positive message that layout
imported successfully