(cherry picked from commit 8dedb5c7)

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"

Bharadwaj Raju authored Jul 13, 2022 and Alexander Stippich committed Jul 13, 2022

- Change configure menu item text to "Configure Skanpage…" from "Settings" (like other KDE apps)
- Change default shortcut for configure to Ctrl+Shift+, from Ctrl+C (like other KDE apps)
- Change title to "Configure" from "Skanpage Settings" (like other KDE apps)
- Use Kirigami FormLayout's built-in labels instead of custom RowLayouts with Label and control
- Express min height and width in [grid units instead of pixels](https://develop.kde.org/hig/layout/units/)
- Make the "show all devices" checkbox a radio button
- Make folder selector look and behave like in other parts of KDE (eg Configure Dolphin > Startup)

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 5c77886e)

BUG: 453829

BUG: 446956

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"

(cherry picked from commit 9d77ef2a)

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