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"

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"

BUG: 436375
FIXED-IN: 5.17.1

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 was added to work around rendering failures. The underlying
probblem is with chromium (and qtwebengine as a consequence) in
combination with glibc 2.33. qtwebengine should be patched, instead
of generally dropping measures meant to improve security.

This reverts commit 5542a54a.

message

CCBUG: 435410

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 fd968aca)

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"

If we are in auto encryption mode, we need to retrigger the calulation
of the encryption state, as it is false by default. And will be
reenabled, if we have keys for every recipient.

As composerBase was added with the message before the identity was set
correctly, the encryption state was calculated against the default
identity. This issue is only visible, if the default identity has
pgpAutoEncryption disabled.

If Autocrypt key is detected for a recipient, the mail is automatically
encrypted and the user sees feedback, that an encryption key is
available.

CCBUG: 388036

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"