Ingo Klöcker authored Jun 30, 2022 and Laurent Montel committed Jun 30, 2022

(cherry picked from commit d1a7ec55)

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"

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 order to fix:
[   16s] /home/abuild/rpmbuild/BUILD/libkleo-21.12.3/src/kleo/keyserverconfig.cpp:73:44:   required from here
[   16s] /home/abuild/rpmbuild/BUILD/libkleo-21.12.3/src/utils/algorithm.h:35:30: error: no matching function for call to 'begin(QStringList&)'
[   16s]    35 |     std::transform(std::begin(c), std::end(c), std::begin(c), op);
[   16s]       |                    ~~~~~~~~~~^~~

The change is documented here:
https://gcc.gnu.org/gcc-12/porting_to.html#header-dep-changes

(cherry picked from commit f290218a)

For certificate groups many model entries are not applicable. Instead
of an empty result return "not applicable" as text for screen readers
for those entries.

GnuPG-bug-id: 5876

If we don't do this, then QAccessibleTable, which is used for the
QListView of the combo box pop up, miscalculates the child from the
logical index. The causes the weird effect that, when you move the
cursor down in the pop up, then the screen reader reads the model
items in columns-first order, i.e. for the second entry in the
combo box it reads the second column of the first row (i.e. the first
entry) instead of the first column of the second row.
This is clearly a bug in QAccessibleTable which shouldn't consider the
column count if QAccessibleTable provides the interface for a list view.

For the combo box we anyway need the first column of the key list model
only, so we can simply pretend that there is only one column.

GnuPG-bug-id: 5845

This makes sure that AllResolved is returned only if signing keys have
been found for the required protocols.

GnuPG-bug-id: 5869

Add a fully trusted public OpenPGP key for openpgp-only@example.net and
a trusted public S/MIME certificate for smime-only@example.net.

GnuPG-bug-id: 5869

This makes it easier to enter a custom reader ID or port number because
one does not need to delete the default text.

GnuPG-bug-id: 5857

This allows usage of the reader port selection widget outside of the
generic crypto config module.

GnuPG-bug-id: 5857

GnuPG-bug-id: 5845

Set the accessible name of the button. Qt provides the tool tip with the
identical text as accessible description, but the accessible description
does not seem to be used by all screenreaders by default.

GnuPG-bug-id: 5845

KLineEdit was used because it provided a clear button. Now that
QLineEdit also provides a clear button using KLineEdit makes no
sense anymore.

For people using screen readers an empty text representation may result
in silence. Use "no name" for an empty name entry and "no email" for an
empty email entry instead.

GnuPG-bug-id: 5841

GnuPG-bug-id: 5841

These helpers create strings that are more suitable for screenreaders
than the corresponing strings created for displaying on screen.

For dates we use the system's long format. Unfortunately, this may contain
the day of the week which is a bit too verbose, but it's certainly better
understandable than a string of three numbers.

For hex ids (i.e. key ids and fingerprints) we take groups of four
separating all characters with spaces (to avoid strings of digits to
be read as numbers) and separating all groups with commas (to force
a pause between the groups).

GnuPG-bug-id: 5841

GnuPG-bug-id: 5775

GnuPG-bug-id: 5775