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"

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

This is the last and only build-time warning from compiler:

[11/23] Building CXX object src/CMakeFiles/kcm_sddm.dir/themesmodel.cpp.o
/kde/src/plasma/sddm-kcm/src/themesmodel.cpp: In member function ‘virtual QVariant ThemesModel::data(const QModelIndex&, int) const’:
/kde/src/plasma/sddm-kcm/src/themesmodel.cpp:96:9: warning: this statement may fall through [-Wimplicit-fallthrough=]
   96 |         if (metadata.supportsBackground()) {
      |         ^~
/kde/src/plasma/sddm-kcm/src/themesmodel.cpp:99:5: note: here
   99 |     case DeletableRole:
      |     ^~~~

We smooth the theme image; we should smooth the wallpaper image too for
maximum visual fidelity.

In the past this looked bad, but it's better now, perhaps due to other
code changes made since then.

This caused the wallpaper image's source size to be waaaaaaay too high
for people using screen scaling.

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"

GIT_SILENT

GIT_SILENT