Nicolas Fella authored Dec 19, 2022 and Elvis Angelaccio committed Feb 06, 2023

This is volatile state, not config, so store it in the appropriate location

Ilya Pominov authored Nov 25, 2022 and Elvis Angelaccio committed Feb 06, 2023

Ignore directory sizes, because all child entries are passed to
ExtractJob constructor (see Part::addChildren()), and directory sizes
are the sum of the sizes of child entries (see
ArchiveModel::traverseAndComputeDirSizes())

Ilya Pominov authored Nov 25, 2022 and Ilya Pominov committed Feb 04, 2023

Amends: c2f144e6

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 8cf234bd)

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 14315a4a)

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"

Follow-up of commit cfee2c44

The bug in libzip has since been fixed, so we can safely restore the
ZIP_FL_ENC_GUESS flag and always expect a UTF-8 encoded comment.

Also that commit wrongly claimed that QString::fromLocal8Bit() was a
"safeguard" against non-UTF-8 encodings, but that's not true.