Summary: Needs explicit approval from Dan.

Reviewers: dvratil

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D16970

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"

Thanks Jan Hambrecht for debugging

BUG: 398036
FIXED-IN: 5.9.1

CCBUG: 398036

Some other IMAP services are offering XOAUTH2 method, but we only
support OAuth on Gmail at the moment.

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"

CCBUG: 397483

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"

This way the SMTP transport can share tokens with the IMAP resource
for the same account (and other services using different scopes).

Port 25 is generally used for MTA-MTA communication, while port 587 should be
used for email submission by MUAs (and major services like gmail don't even listen
on port 25 anymore). The ServerTest will still fall back to trying port 25 if
it fails to connect on port 587 to keep supporting anctient and misconfigured
SMTP servers.

This way the SMTP encryption options are consistent with IMAP and POP3
encryption settings.

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 allows authenticating with Gmail SMTP server through OAuth,
which supports 2FA and Gmail for Business addresses.

This is the GUI for the option, appearing on the "Advanced" tab
of the resource configuration dialogue.  The setting is take
from the transport configuration and set for the SMTP session.

BUG: 379539

Differential Revision: https://phabricator.kde.org/D10941

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"

FIXED-IN: 5.7.2
BUG: 388573