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"

NO_CHANGELOG

Martin Tobias Holmedahl Sandsmark authored May 14, 2022 and Alexander Lohnau committed Jun 07, 2022

Thanks to Kai Uwe Broulik for debugging (which I saw too late, but oh
well).

BUG: 453497

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 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: 447312

Do not set it as UDS_NAME, see commit d27defbd.

Igor Kushnir authored May 30, 2022 and Jonathan Marten committed May 31, 2022

After recent major changes to man's listDir() (starting at
223de3ec and ending with
1d752c04) man page names acquired
section suffixes in parentheses. For example, "aio.h" became
"aio.h (0p)". This page name format change broke URLs formed by joining
a section URL and a page name, e.g. "man:/(7)" + '/' + "bootup (7)".
The `xdg-open "man:/(7)/bootup (7)"` command opens this broken link in
KHelpCenter, which displays the "Manual Page Viewer Error" page.
The added section suffixes also break displaying man pages in KDevelop's
Man Pages documentation plugin.

Revert this breaking change by removing the section suffix rather than
reformatting it into parentheses.

(cherry picked from commit d676e808)

BUG: 452920
FIXED-IN: 22.04.02

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"

Méven Car authored May 08, 2022 and Méven Car committed May 15, 2022

Allows recentlyused:/ users (aka dolphin) to forget resources, while staying loosely tied to KActivitiesStats.

Bump KF5_MIN_VERSION to 5.94

It allows to save some resources.

We do not need to use the deprecated KPluginLoader anymore

This makes dirs with a dot in their name or special names (such as 'core') report a wrong mime type

BUG: 452940

previously the error scenario didn't return early because of the close, so
instead put the close in a scopeguard and return immediately after error.
otherwise we'd emit both error and finished resulting in a state violation.

this way we preserve credentials and whatnot

Dāvis Mosāns authored Mar 27, 2022 and Harald Sitter committed Apr 20, 2022

Currently we would support only `mtp:/` but there's no reason
to have such limitation

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: 447527

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"