GitLab

(cherry picked from commit 05574e83)

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

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

(cherry picked from commit bb43c07a)

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

Signed-off-by: Snehit Sah <snehitsah@protonmail.com>

(cherry picked from commit 54b63c57)

Eric Armbruster authored Jan 17, 2022 and Eric Armbruster committed Jan 17, 2022

In order to achieve more consistency across KDE apps this commit
- removes the superfluous close button
- renames the configure button and left aligns it
- moves the about button into the help menu

BUG: 448327

Otherwise the help action is triggered when we click on About

This has the sideeffect that the About button is now on the right with the other action buttons instead of on the left next to the Help button

Not sure we can do anything about that without going away from QDialogButtonBox

(cherry picked from commit 06dab037)

also remember device vendor and model manually