GitLab

(cherry picked from commit d3e12a4b)

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"

KeyCache destroys itself whenever the last reference to it is released.
Since reinitialization of the cache is very expensive if one has a lot
of keys in the key ring, keep a reference on KeyCache for the whole
lifetime of the kernel. This will greatly speed up selection of keys,
e.g. when composing an encrypted message or when configuring the keys
in the identity dialog.

Also set up automatic update of the key cache on changes in the key ring
by watching the GnuPG home directory (as Kleopatra does).

The secret key is not needed for encryption. Not requiring a secret key
for encryption allows selecting a key where the secret key is stored
on a different computer.

Make the two checkboxes span all columns of the grid so that they do
not unnecessarily restrict the width of the second column with the
key selection widgets.