GitLab

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"

This ensures that the selection does not change for example after
setting the owner trust of the currently selected key.

* Store the current selection if an imminent model change is announced
* Restore (if possible) the selection after the model change
* Tell the model to use the key cache and remove the custom "Loading
  keys" item only after the initial key listing.
* Select the default key only after the initial key listing.
* In setCurrentKey() look up the key by fingerprint instead of by the
  key object because the latter fails if the key was updated.
* In setCurrentKey() fall back to selecting the default key if the
  given key isn't found and selectPerfectIdMatch() also fails.
* Add removeCustomItem() (currently only used in the test).

GnuPG-bug-id: 5511

If a model reset is in progress, then no other model signals like
rowsAboutToBeInserted, rowsInserted, dataChanged, etc. are emitted.
This way we avoid that users of the model try to react on changes
while the model is still incomplete.

GnuPG-bug-id: 5511

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"

To prevent the configuration of the directory services to be corrupted
we disable the configuration if (q)gpgme is incompatible with the
extended keyserver spec (with keyserver flags).

GnuPG-bug-id: 5465

Options that are not supported by the currently used version of GnuPG
are still configurable to allow usage of Kleopatra with different
versions of GnuPG. Older versions of gpgsm will simply ignore the options.

GnuPG-bug-id: 5465

Adds support for using service running on the users' Active Directory
and for other new X.509 keyserver options added to GnuPG 2.2.18.

GnuPG-bug-id: 5465

GnuPG-bug-id: 5465

This preserves keyserver flags that are not known or not handled by
KeyserverConfig, e.g. the legacy "ldaps" flag.

GnuPG-bug-id: 5465

Add Default to KeyserverConnection enum to be able to treat an
explicit plain connection differently from a default connection.

GnuPG-bug-id: 5465

GnuPG-bug-id: 5465

It has fromUrl() and toUrl() methods for converting between a
configuration and a QUrl as expected by QGpgMENewCryptoConfigEntry.

GnuPG-bug-id: 5465

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"

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

The sender is also needed for encrypt to self.

GnuPG-bug-id: 5283

This is a first quick improvement for making it possible for the user
to change the flags, i.e. to enable/disable usage of TLS.

GnuPG-bug-id: 5465

The flags are stored as fragment of a QUrl.

This fixes a regression introduced with 5de2f7ac.