GitLab

It doesn't do anything.

(cherry picked from commit 9ed8bcff)

This reverts commit eb3e2e88.

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"

Opening images in Gwenview is currently broken because we pass the desktop entry (org.kde.gwenview) instead of the Exec line (gwenview).

Instead of deternining the image viewer ourselves we can simply deleate that to gpg since that supports using xdg-open.
gpg's behaviour is faulty in two ways at the moment:
1) display is preferred over xdg-open resulting in the image being opened via imagemagick
2) Opening via xdg-open is broken

I have sent patches for both to gnupg.

Until these are merged this will result in photos always being opened via imagemagick which is strictly better than not opening them at all.

BUG: 400324

(cherry picked from commit fc912270)

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 1b8764e2)

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"

I think we can savely assume noone expects us to handle this after more than a
decade. Starting from a clean config would be reasonable now.

As far as I can tell this has always been broken. When the code was moved into
kgpginterface it started using the selected input keyserver, and before it was
entirely ignoring it and just used the default one.

BUG: 422611

(cherry picked from commit 6426c7c1)

(cherry picked from commit d2b01f83)

Using `kgpg` as the icons is not semantically correct and results in the
icons being illegible whith dark color schemes because `kgpg` is an app
icon and app icons don't change their colors, but it has the appearance
of a monochrome color-changing icon.

BUG: 420457
FIXED-IN: 20.08.0