GitLab

The concept is deprecated and an empty key has no effect.
See https://phabricator.kde.org/T13553 for details.

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 3187e7b4)

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"

* Change http: to https:
* Use more entities and suitable tags
* Add more menu items, some fixes and order them
* Fix a GUI menu item

MS Store.

BUG: 430055
FIXED-IN: 20.12.1

Search only Qalculate with version >=3.8.0, because of lesser versions will crash (https://bugs.kde.org/show_bug.cgi?id=415302)

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 78704a55)

!23 (comment 136541)

This way, Dolphin will still show Ark etc. as secondary options to 'open
with'.

When we are thrown to the additional input prompt, simply report and error and send an interrupt signal to exit.

Do not try to guess what the problem is and fix it: this might be caused by an unmatched opening bracket or closing bracket, in which case we would be stuck in the additional input prompt forever

BUG: 429078

BUG: 428961
FIXED-IN: 20.12

(cherry picked from commit 2d9a4c4e)

Gives us out-of-the-box future proof python detection (python-3.9 right now).